From 15f3918171020dbf7dfb8b69c99ad4bebd3a1407 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 17 May 2022 10:23:54 -0700 Subject: [PATCH] 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 --- packaging/copr/make-package.sh | 6 ++++-- packaging/copr/subsurface.spec | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packaging/copr/make-package.sh b/packaging/copr/make-package.sh index 87d906c6e..d561d9989 100644 --- a/packaging/copr/make-package.sh +++ b/packaging/copr/make-package.sh @@ -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 diff --git a/packaging/copr/subsurface.spec b/packaging/copr/subsurface.spec index 2726ee4f2..e86f3c326 100644 --- a/packaging/copr/subsurface.spec +++ b/packaging/copr/subsurface.spec @@ -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