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

[svn_grass at osgeo.org]

Author: neteler
Date: 2018-10-28 14:14:54 -0700 (Sun, 28 Oct 2018)
New Revision: 73617

Modified:
   grass/branches/releasebranch_7_4/rpm/grass.spec
Log:
Fedora rpm SPEC: clean up of PostgreSQL support (merge of https://src.fedoraproject.org/rpms/grass/pull-request/4) ;  update to G7.4.2

Modified: grass/branches/releasebranch_7_4/rpm/grass.spec
===================================================================
--- grass/branches/releasebranch_7_4/rpm/grass.spec	2018-10-28 21:13:38 UTC (rev 73616)
+++ grass/branches/releasebranch_7_4/rpm/grass.spec	2018-10-28 21:14:54 UTC (rev 73617)
@@ -2,8 +2,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:		grass
-Version:	7.4.1
-Release:	6%{?dist}
+Version:	7.4.2
+Release:	1%{?dist}
 Summary:	GRASS GIS - Geographic Resources Analysis Support System
 
 %if 0%{?rhel}
@@ -49,11 +49,10 @@
 %endif
 BuildRequires:	python < 3.0
 BuildRequires:	python2-numpy
-%if (0%{?rhel} > 6 || 0%{?fedora})
+%if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires:	postgresql-devel
 %else
-# RHEL6: PG from http://yum.postgresql.org/9.6/redhat/rhel-$releasever-$basearch/
-BuildRequires:  postgresql96-devel postgresql96-libs
+BuildRequires:	libpq-devel
 %endif
 BuildRequires:	proj-devel
 BuildRequires:	proj-epsg
@@ -188,12 +187,7 @@
 %else
 	--with-mysql-libs=%{_libdir}/mysql \
 %endif
-%if (0%{?rhel} > 6 || 0%{?fedora})
-        --with-postgres-includes=%{_includedir}/pgsql \
-%else
-	--with-postgres-includes=%{_prefix}/pgsql-9.6/include/ \
-	--with-postgres-libs=%{_prefix}/pgsql-9.6/lib/ \
-%endif
+	--with-postgres-includes=%{_includedir}/pgsql \
 	--with-cairo-ldflags=-lfontconfig \
 	--with-freetype-includes=%{_includedir}/freetype2 \
 	--with-proj-share=%{_datadir}/proj
@@ -340,6 +334,15 @@
 %{_libdir}/%{name}%{shortver}/include
 
 %changelog
+* Sun Oct 28 2018 Markus Neteler <neteler at mundialis.de> - 7.4.2-0
+- new upstream version 7.4.2
+
+* Sun Sep 09 2018 Pavel Raiskup <praiskup at redhat.com> - 7.4.1-8
+- Clean up of PostgreSQL support (PR#4)
+
+* Tue Jul 31 2018 Florian Weimer <fweimer at redhat.com> - 7.4.1-7
+- Rebuild with fixed binutils
+
 * 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)
 
@@ -378,6 +381,7 @@
 
 * Mon Jan 15 2018 Markus Metz <metz at mundialis.de> - 7.4.0-1
 - New upstream version 7.4.0
+- Major cleanup of SPEC file
 - Fix grass-devel which needs include/grass and include/Make dirs
 
 * Fri Jul 21 2017 Kalev Lember <klember at redhat.com> - 7.2.1-2