Browse Source

rpm spec: +zstd, adjust for RHEL

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72088 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 7 years ago
parent
commit
bfa3ddb9e7
2 changed files with 12 additions and 10 deletions
  1. 6 5
      rpm/grass.spec
  2. 6 5
      rpm/grass_unversioned.spec

+ 6 - 5
rpm/grass.spec

@@ -159,8 +159,11 @@ CXXFLAGS="-std=c++98 ${CFLAGS}"
 %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 @@ CXXFLAGS="-std=c++98 ${CFLAGS}"
 %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}

+ 6 - 5
rpm/grass_unversioned.spec

@@ -159,8 +159,11 @@ CXXFLAGS="-std=c++98 ${CFLAGS}"
 %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 @@ CXXFLAGS="-std=c++98 ${CFLAGS}"
 %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}