From 444ca6a5a803512ff34c35260d7c566aebeb6f51 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mon, 18 May 2020 12:00:39 +0200 Subject: [PATCH 1/6] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 6af8d061e1f6037f4cc60a89d4f28f1e9fbaa6c3 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 17:45:18 +0000 Subject: [PATCH 2/6] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From cdd034bc1a0e0144399a1751457feda718723fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 7 Nov 2021 10:03:38 +0100 Subject: [PATCH 3/6] Add patch to fix installation path in pkgconfig file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- grass.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 502fe8b..ec84f53 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 7.8.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -24,6 +24,9 @@ License: GPLv2+ URL: https://grass.osgeo.org Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz +# fix pkgconfig file +Patch0: grass-pkgconfig.patch + BuildRequires: bison %if %{with flexiblas} BuildRequires: flexiblas-devel @@ -173,6 +176,7 @@ GRASS GIS development headers %prep %setup -q +%patch0 -p1 -b.libdir # Correct mysql_config query sed -i -e 's/--libmysqld-libs/--libs/g' configure @@ -362,6 +366,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sun Nov 07 2021 Björn Esser - 7.8.6-2 +- Add patch to fix installation path in pkgconfig file + * Tue Nov 02 2021 Markus Neteler - 7.8.6-1 - New upstream version GRASS GIS 7.8.6 From 96600ab67dacd145c301cf4badc2c3163ca895f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 7 Nov 2021 10:23:31 +0100 Subject: [PATCH 4/6] Add actual patch to repo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- grass-pkgconfig.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 grass-pkgconfig.patch diff --git a/grass-pkgconfig.patch b/grass-pkgconfig.patch new file mode 100644 index 0000000..9afaf06 --- /dev/null +++ b/grass-pkgconfig.patch @@ -0,0 +1,24 @@ +Index: grass-7.8.6/grass.pc.in +=================================================================== +--- grass-7.8.6.orig/grass.pc.in ++++ grass-7.8.6/grass.pc.in +@@ -2,13 +2,13 @@ + # + # See also: grass@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@ --config + +-prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ +-exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ +-libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib +-includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include ++prefix=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ ++exec_prefix=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ ++libdir=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib ++includedir=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include + + Name: GRASS + Description: GRASS GIS + Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ +-Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz +-Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include ++Libs: -L@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz ++Cflags: -I@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include From b7d62835463cca7cd58fd41a791f9c576b483acc Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Wed, 23 Feb 2022 21:06:39 +0100 Subject: [PATCH 5/6] New upstream version GRASS GIS 7.8.7 --- .gitignore | 1 + grass.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2d849e2..b92afac 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /grass-7.8.4.tar.gz /grass-7.8.5.tar.gz /grass-7.8.6.tar.gz +/grass-7.8.7.tar.gz diff --git a/grass.spec b/grass.spec index ec84f53..eaca93e 100644 --- a/grass.spec +++ b/grass.spec @@ -2,8 +2,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 7.8.6 -Release: 2%{?dist} +Version: 7.8.7 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -366,6 +366,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Wed Feb 23 2022 Markus Neteler - 7.8.7-1 +- New upstream version GRASS GIS 7.8.7 + * Sun Nov 07 2021 Björn Esser - 7.8.6-2 - Add patch to fix installation path in pkgconfig file @@ -405,16 +408,16 @@ fi * Tue Dec 22 2020 Markus Neteler - 7.8.5-1 - New upstream version GRASS GIS 7.8.5 -* Tue Nov 24 20:59:37 CET 2020 Markus Neteler - 7.8.4-6 +* Tue Nov 24 2020 Markus Neteler - 7.8.4-6 - Clean up proj-datumgrid requires < f34+ -* Fri Nov 20 15:59:37 CET 2020 Sandro Mani - 7.8.4-5 +* Fri Nov 20 2020 Sandro Mani - 7.8.4-5 - Drop proj-datumgrid requires on f34+ -* Fri Nov 6 22:26:41 CET 2020 Sandro Mani - 7.8.4-4 +* Fri Nov 6 2020 Sandro Mani - 7.8.4-4 - Rebuild (proj, gdal) -* Wed Nov 4 18:22:40 CET 2020 Sandro Mani - 7.8.4-3 +* Wed Nov 4 2020 Sandro Mani - 7.8.4-3 - Rebuild (PDAL) * Sat Oct 17 2020 Markus Neteler - 7.8.4-2 diff --git a/sources b/sources index 9d7b11b..d3aefa1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-7.8.6.tar.gz) = 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df +SHA512 (grass-7.8.7.tar.gz) = 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303 From c3f7a1c5fd8cb6db1ff73313f8c7a866a3896034 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Mon, 7 Aug 2023 09:40:48 +0200 Subject: [PATCH 6/6] New upstream version GRASS GIS 7.8.8 --- .gitignore | 1 + grass.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b92afac..50ba71c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /grass-7.8.5.tar.gz /grass-7.8.6.tar.gz /grass-7.8.7.tar.gz +/grass-7.8.8.tar.gz diff --git a/grass.spec b/grass.spec index eaca93e..225b8da 100644 --- a/grass.spec +++ b/grass.spec @@ -2,7 +2,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 7.8.7 +Version: 7.8.8 Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System @@ -20,7 +20,7 @@ Summary: GRASS GIS - Geographic Resources Analysis Support System # "%%bcond_without" means "ENABLE by default and create a --without option" %bcond_without python3 -License: GPLv2+ +License: GPL-2.0-or-later URL: https://grass.osgeo.org Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz @@ -193,6 +193,7 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},' CFLAGS="$(echo ${RPM_OPT_FLAGS} | sed -e 's/ -Werror=format-security//')" CXXFLAGS="-std=c++98 ${CFLAGS}" %configure \ + --prefix=%{_libdir} \ --with-cxx \ --with-tiff \ --with-png \ @@ -239,6 +240,9 @@ CXXFLAGS="-std=c++98 ${CFLAGS}" --with-zstd \ --with-proj-share=%{_datadir}/proj +# .package_note hack for RHBZ #2084342 and RHBZ #2102895 +sed -i "s+ -Wl,-dT,${RPM_BUILD_DIR}/grass-%{version}/.package_note-grass-%{version}-%{release}.%{_arch}.ld++g" include/Make/Platform.make + make %{?_smp_mflags} # by default, grass will be installed to /usr/grass-%%{version} @@ -359,13 +363,16 @@ fi %{_libdir}/%{name}%{shortver}/gui %files devel -%doc TODO doc/* SUBMITTING +%doc TODO doc/* CONTRIBUTING.md %{macrosdir}/macros.%{name} %{_libdir}/pkgconfig/* %dir %{_libdir}/%{name}%{shortver}/lib %{_libdir}/%{name}%{shortver}/include %changelog +* Sun Aug 06 2023 Markus Neteler - 7.8.8-1 +- New upstream version GRASS GIS 7.8.8 + * Wed Feb 23 2022 Markus Neteler - 7.8.7-1 - New upstream version GRASS GIS 7.8.7 diff --git a/sources b/sources index d3aefa1..2dd3a31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-7.8.7.tar.gz) = 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303 +SHA512 (grass-7.8.8.tar.gz) = 63aba6e4efe82da1ad242b2db96e961304c973cba9567ede1e0f1ea480275229be61b54ff9e493b8282f53002f581d4b28caa5340c6a6c61b4831231be6469fa