[GRASS-SVN] r72088 - grass/trunk/rpm

[svn_grass at osgeo.org]

Author: mmetz
Date: 2018-01-16 10:27:16 -0800 (Tue, 16 Jan 2018)
New Revision: 72088

Modified:
   grass/trunk/rpm/grass.spec
   grass/trunk/rpm/grass_unversioned.spec
Log:
rpm spec: +zstd, adjust for RHEL

Modified: grass/trunk/rpm/grass.spec
===================================================================
--- grass/trunk/rpm/grass.spec	2018-01-16 13:57:48 UTC (rev 72087)
+++ grass/trunk/rpm/grass.spec	2018-01-16 18:27:16 UTC (rev 72088)
@@ -159,8 +159,11 @@
 %if (0%{?rhel} > 6 || 0%{?fedora})
 	--with-netcdf=%{_bindir}/nc-config \
 %endif
+%if 0%{?fedora}
+	--with-liblas=%{_bindir}/liblas-config \
+%endif
 	--with-mysql-includes=%{_includedir}/mysql \
-%if (0%{?fedora} > 28)
+%if (0%{?fedora} > 27)
 	--with-mysql-libs=%{_libdir} \
 %else
 	--with-mysql-libs=%{_libdir}/mysql \
@@ -173,10 +176,8 @@
 %endif
 	--with-cairo-ldflags=-lfontconfig \
 	--with-freetype-includes=%{_includedir}/freetype2 \
-	--with-proj-share=%{_datadir}/proj \
-%if 0%{?fedora}
-	--with-liblas=%{_bindir}/liblas-config
-%endif
+	--with-zstd \
+	--with-proj-share=%{_datadir}/proj
 
 %if (0%{?rhel} > 6 || 0%{?fedora})
 make %{?_smp_mflags}

Modified: grass/trunk/rpm/grass_unversioned.spec
===================================================================
--- grass/trunk/rpm/grass_unversioned.spec	2018-01-16 13:57:48 UTC (rev 72087)
+++ grass/trunk/rpm/grass_unversioned.spec	2018-01-16 18:27:16 UTC (rev 72088)
@@ -159,8 +159,11 @@
 %if (0%{?rhel} > 6 || 0%{?fedora})
 	--with-netcdf=%{_bindir}/nc-config \
 %endif
+%if 0%{?fedora}
+	--with-liblas=%{_bindir}/liblas-config \
+%endif
 	--with-mysql-includes=%{_includedir}/mysql \
-%if (0%{?fedora} > 28)
+%if (0%{?fedora} > 27)
 	--with-mysql-libs=%{_libdir} \
 %else
 	--with-mysql-libs=%{_libdir}/mysql \
@@ -173,10 +176,8 @@
 %endif
 	--with-cairo-ldflags=-lfontconfig \
 	--with-freetype-includes=%{_includedir}/freetype2 \
-	--with-proj-share=%{_datadir}/proj \
-%if 0%{?fedora}
-	--with-liblas=%{_bindir}/liblas-config
-%endif
+	--with-zstd \
+	--with-proj-share=%{_datadir}/proj
 
 %if (0%{?rhel} > 6 || 0%{?fedora})
 make %{?_smp_mflags}