From bb06a8fa68d845f99bc347efd8660e1e9e8699dd Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Thu, 12 May 2022 17:50:29 +0200 Subject: [PATCH] New upstream version GRASS GIS 8.0.2 --- .gitignore | 1 + grass-pkgconfig.patch | 10 +++++----- grass.spec | 8 ++++++-- sources | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 32e3b21..50d8032 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /grass-7.8.6.tar.gz /grass-8.0.0.tar.gz /grass-8.0.1.tar.gz +/grass-8.0.2.tar.gz diff --git a/grass-pkgconfig.patch b/grass-pkgconfig.patch index 9afaf06..e713aee 100644 --- a/grass-pkgconfig.patch +++ b/grass-pkgconfig.patch @@ -1,10 +1,10 @@ -Index: grass-7.8.6/grass.pc.in -=================================================================== ---- grass-7.8.6.orig/grass.pc.in -+++ grass-7.8.6/grass.pc.in +diff --git a/grass.pc.in b/grass.pc.in +index 94ca57b65..aec77d095 100644 +--- a/grass.pc.in ++++ b/grass.pc.in @@ -2,13 +2,13 @@ # - # See also: grass@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@ --config + # See also: grass --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@ diff --git a/grass.spec b/grass.spec index 8d04001..9d8a162 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: 8.0.1 -Release: 3%{?dist} +Version: 8.0.2 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -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 \ @@ -363,6 +364,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu May 12 2022 Markus Neteler - 8.0.2-1 +- New upstream version GRASS GIS 8.0.2 + * Tue Mar 29 2022 Markus Neteler - 8.0.1-3 - Rebuild for pdal-2.4.0 diff --git a/sources b/sources index f5b7a73..eb775d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.0.1.tar.gz) = ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f +SHA512 (grass-8.0.2.tar.gz) = fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c