[GRASS-SVN] r73018 - grass/branches/releasebranch_7_4/rpm

[svn_grass at osgeo.org]

Author: neteler
Date: 2018-07-30 00:15:59 -0700 (Mon, 30 Jul 2018)
New Revision: 73018

Modified:
   grass/branches/releasebranch_7_4/rpm/grass.spec
Log:
Fedora RPM SPEC: fix wxGTK-devel and cairo-devel dependencies; Python macro; explicitely add gcc-c++ BuildRequires (sync to Fedora koji system)

Modified: grass/branches/releasebranch_7_4/rpm/grass.spec
===================================================================
--- grass/branches/releasebranch_7_4/rpm/grass.spec	2018-07-30 07:15:31 UTC (rev 73017)
+++ grass/branches/releasebranch_7_4/rpm/grass.spec	2018-07-30 07:15:59 UTC (rev 73018)
@@ -3,7 +3,7 @@
 
 Name:		grass
 Version:	7.4.1
-Release:	2%{?dist}
+Release:	6%{?dist}
 Summary:	GRASS GIS - Geographic Resources Analysis Support System
 
 %if 0%{?rhel}
@@ -16,6 +16,8 @@
 
 BuildRequires:	bison
 BuildRequires:	blas-devel
+BuildRequires:	cairo-devel
+BuildRequires:	gcc-c++
 BuildRequires:	desktop-file-utils
 BuildRequires:	fftw-devel
 BuildRequires:	flex
@@ -45,6 +47,7 @@
 %if (0%{?rhel} > 6 || 0%{?fedora})
 BuildRequires:	netcdf-devel
 %endif
+BuildRequires:	python < 3.0
 BuildRequires:	python2-numpy
 %if (0%{?rhel} > 6 || 0%{?fedora})
 BuildRequires:	postgresql-devel
@@ -80,12 +83,12 @@
 BuildRequires:	sqlite-devel
 BuildRequires:	subversion
 BuildRequires:	unixODBC-devel
-BuildRequires:	wxGTK-devel
 BuildRequires:	zlib-devel
 
 Requires:	geos
 Requires:	proj-epsg
 Requires:	proj-nad
+Requires:	python2
 Requires:	python2-numpy
 %if 0%{?rhel}
 Requires:	wxPython
@@ -140,7 +143,9 @@
 sed -i -e 's/--libmysqld-libs/--libs/g' configure
 
 # Fixup shebangs
-find -type f | xargs sed -i -e 's,#!/usr/bin/env python,#!%{__python},'
+# in future python3 will be supported
+find -type f | xargs sed -i -e 's,#!/usr/bin/env python,#!%{__python2},'
+sed -i -e 's,python,%{__python2},g' include/Make/Platform.make.in
 find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},'
 
 %build
@@ -147,6 +152,8 @@
 # Package is not ready for -Werror=format-security or the C++11 standard
 CFLAGS="$(echo ${RPM_OPT_FLAGS} | sed -e 's/ -Werror=format-security//')"
 CXXFLAGS="-std=c++98 ${CFLAGS}"
+# enforce python2 during build process
+export GRASS_PYTHON="/usr/bin/python2"
 %configure \
 	--with-cxx \
 	--with-tiff \
@@ -333,6 +340,18 @@
 %{_libdir}/%{name}%{shortver}/include
 
 %changelog
+* Sun Jul 29 2018 Markus Neteler <neteler at mundialis.de> - 7.4.1-6
+- added BuildRequires gcc-c++ to address RHBZ #1604262 due to RHBZ #1551327 (removing gcc and gcc-c++ from default buildroot)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng at fedoraproject.org> - 7.4.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Jul 08 2018 Markus Neteler <neteler at mundialis.de> - 7.4.1-4
+- fix Python macro to explicitely use Python 2 interpreter
+
+* Sat Jul 07 2018 Scott Talbert <swt at techie.net> - 7.4.1-3
+- Update BRs: remove wxGTK-devel and add cairo-devel
+
 * Sat Jun 23 2018 Markus Neteler <neteler at mundialis.de> - 7.4.1-2
 - fix wxPython package dependency name for CentOS7