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

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Jan 28 07:30:18 PST 2018


Author: neteler
Date: 2018-01-28 07:30:18 -0800 (Sun, 28 Jan 2018)
New Revision: 72177

Modified:
   grass/trunk/rpm/grass.spec
Log:
rpm SPEC: update for mysql-devel/mariadb-connector-c-devel on Fedora27+

Modified: grass/trunk/rpm/grass.spec
===================================================================
--- grass/trunk/rpm/grass.spec	2018-01-28 15:17:06 UTC (rev 72176)
+++ grass/trunk/rpm/grass.spec	2018-01-28 15:30:18 UTC (rev 72177)
@@ -36,7 +36,11 @@
 BuildRequires:	libXmu-devel
 BuildRequires:	mesa-libGL-devel
 BuildRequires:	mesa-libGLU-devel
+%if (0%{?fedora} >= 27)
+BuildRequires:	mariadb-connector-c-devel openssl-devel
+%else
 BuildRequires:	mysql-devel
+%endif
 %if (0%{?rhel} > 6 || 0%{?fedora})
 BuildRequires:	netcdf-devel
 %endif
@@ -163,7 +167,7 @@
 	--with-liblas=%{_bindir}/liblas-config \
 %endif
 	--with-mysql-includes=%{_includedir}/mysql \
-%if (0%{?fedora} > 27)
+%if (0%{?fedora} >= 27)
 	--with-mysql-libs=%{_libdir} \
 %else
 	--with-mysql-libs=%{_libdir}/mysql \
@@ -256,7 +260,6 @@
 # rpm macro for version checking
 mkdir -p ${RPM_BUILD_ROOT}%{macrosdir}
 cat > ${RPM_BUILD_ROOT}%{macrosdir}/macros.%{name} <<EOF
-# %name version is
 %%%{name}_version %{version}
 EOF
 



More information about the grass-commit mailing list