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

[svn_grass at osgeo.org]

Author: neteler
Date: 2018-06-13 06:45:29 -0700 (Wed, 13 Jun 2018)
New Revision: 72812

Modified:
   grass/branches/releasebranch_7_4/rpm/grass.spec
Log:
Fedora RPM SPEC: add /etc/ld.so.conf.d/grass-*.conf to find libs by Daniele Vigano

Modified: grass/branches/releasebranch_7_4/rpm/grass.spec
===================================================================
--- grass/branches/releasebranch_7_4/rpm/grass.spec	2018-06-13 13:45:22 UTC (rev 72811)
+++ grass/branches/releasebranch_7_4/rpm/grass.spec	2018-06-13 13:45:29 UTC (rev 72812)
@@ -265,6 +265,12 @@
 %%%{name}_version %{version}
 EOF
 
+# Add custom lib path to ld.conf.so.d
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+cat >  %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf<<EOF
+%{_libdir}/%{name}%{shortver}/lib
+EOF
+
 %post
 %if 0%{?rhel}
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -288,6 +294,7 @@
 %postun libs -p /sbin/ldconfig
 
 %files
+%exclude %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %exclude %{_libdir}/%{name}%{shortver}/driver/db/*
 %exclude %{_libdir}/%{name}%{shortver}/lib
 %exclude %{_libdir}/%{name}%{shortver}/include
@@ -302,6 +309,7 @@
 
 %files libs
 %license AUTHORS COPYING GPL.TXT CHANGES
+%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %{_libdir}/%{name}%{shortver}/lib/*.%{version}.so
 %{_libdir}/%{name}%{shortver}/lib/*.a
 %dir %{_libdir}/%{name}%{shortver}/driver
@@ -324,6 +332,9 @@
 - new upstream version 7.4.1
 - do not fail on EPEL6 with appstream-util
 
+* Wed Apr 25 2018 Markus Neteler <neteler at mundialis.de> - 7.4.0-5
+- add /etc/ld.so.conf.d/grass-*.conf to find libs by Daniele Viganò <daniele at vigano.me> (RHBZ #1571441)
+
 * Mon Mar 26 2018 Markus Neteler <neteler at mundialis.de> - 7.4.0-4
 - Update Python 2 dependency declarations to new packaging standards
   (author: Iryna Shcherbina <ishcherb at redhat.com> for 7.2.3-2)