build-system: small fixes for Fedora copr build

The extra trailing 'dot' broke the cmake build on Rawhide.
This also tries to give more consistent Summary and Description text for
the Subsurface and Subsurface-test repos on copr.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-05-17 10:23:54 -07:00
parent c2f0a6f3e1
commit 15f3918171
2 changed files with 6 additions and 5 deletions

View file

@ -69,13 +69,15 @@ if [[ "$1" = "post" ]] ; then
# this is a release
echo "RELEASE PROCESS IS NOT WELL TESTED"
REPO="Subsurface"
DESCRIPTION="This is the official Subsurface build, including our own custom libdivecomputer."
SUMMARY="official Fedora RPMs from the Subsurface project"
DESCRIPTION="This is the official Subsurface build, provided by the Subsurface team, including our own custom libdivecomputer."
else
REPO="Subsurface-test"
SUMMARY="test build of the latest development version of Subsurface"
DESCRIPTION="This is a test build of Subsurface, provided by the Subsurface team, based on the latest sources. Only use if you need the bleeding edge of development."
fi
cd rpmbuild
cat ../../subsurface/packaging/copr/subsurface.spec | sed "s/%define latestVersion.*/%define latestVersion $VERSION/;s/DESCRIPTION/$DESCRIPTION/" > SPECS/subsurface.spec
cat ../../subsurface/packaging/copr/subsurface.spec | sed "s/%define latestVersion.*/%define latestVersion $VERSION/;s/DESCRIPTION/$DESCRIPTION/;s/SUMMARY/$SUMMARY/" > SPECS/subsurface.spec
rpmbuild --verbose -bs $(pwd)/SPECS/subsurface.spec
copr build $REPO $(pwd)/SRPMS/subsurface-$VERSION-1.fc*.src.rpm
fi

View file

@ -10,7 +10,7 @@ Name: subsurface
Version: %latestVersion
Release: 1%{?dist}
Summary: A test build of the latest development version of Subsurface
Summary: SUMMARY
License: GPL v2
Url: http://subsurface-divelog.org
@ -88,8 +88,7 @@ mkdir -p install-root
-DLIBDIVECOMPUTER_INCLUDE_DIR=%{_builddir}/install-root/include \
-DLIBGIT2_INCLUDE_DIR=%{_builddir}/install-root/include \
-DLIBDIVECOMPUTER_LIBRARIES=%{_builddir}/install-root/lib/libdivecomputer.a \
-DNO_PRINTING=OFF \
.
-DNO_PRINTING=OFF
%cmake_build
%install