SPECS: starlink-htx.spec - use ld.so.conf.d; rel 2

[glen]

Author: glen                         Date: Thu Oct 20 13:20:44 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use ld.so.conf.d; rel 2

---- Files affected:
SPECS:
   starlink-htx.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/starlink-htx.spec
diff -u SPECS/starlink-htx.spec:1.3 SPECS/starlink-htx.spec:1.4
--- SPECS/starlink-htx.spec:1.3	Sun Nov  2 22:14:49 2003
+++ SPECS/starlink-htx.spec	Thu Oct 20 15:20:37 2005
@@ -4,7 +4,7 @@
 Name:		starlink-htx
 # from URL: v1.2-7 release 218
 Version:	1.2_7.218
-Release:	1
+Release:	2
 # according to http://www.starlink.rl.ac.uk/store/conditions.html
 License:	GPL
 Group:		Applications/Text
@@ -13,10 +13,10 @@
 URL:		http://www.starlink.rl.ac.uk/static_www/soft_further_HTX.html
 BuildArch:	noarch
 Requires(post,postun):	/sbin/ldconfig
-Requires(post,postun):	grep
-Requires(postun):	fileutils
+Requires(triggerpostun):	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# FIXME: FHS for amd64
 %define		stardir		/usr/lib/star
 
 %description
@@ -51,27 +51,22 @@
 	STARLINK=%{stardir} \
 	INSTALL=$RPM_BUILD_ROOT%{stardir}
 
+install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo '%{stardir}/share' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-umask 022
-if ! grep -q '^%{stardir}/share$' /etc/ld.so.conf ; then
-	echo '%{stardir}/share' >> /etc/ld.so.conf
-fi
-/sbin/ldconfig
-
-%postun
-if [ "$1" = "0" ]; then
-	umask 022
-	grep -v "^%{stardir}/share$" /etc/ld.so.conf > /etc/ld.so.conf.tmp
-	mv -f /etc/ld.so.conf.tmp /etc/ld.so.conf
-fi
-/sbin/ldconfig
+%post -p	/sbin/ldconfig
+%postun -p	/sbin/ldconfig
+
+%triggerpostun -- %{name} < 1.2_7.218-1.1
+sed -i -e "/^%(echo %{stardir}/share | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf
 
 %files
 %defattr(644,root,root,755)
 %doc htx.news
+%verify(not md5 mtime size) /etc/ld.so.conf.d/*.conf
 # starlink software hierarchy
 %dir %{stardir}
 %dir %{stardir}/bin
@@ -100,6 +95,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/10/20 13:20:37  glen
+- use ld.so.conf.d; rel 2
+
 Revision 1.3  2003/11/02 21:14:49  ankry
 - restore Source0 URL
 
@@ -108,4 +106,3 @@
 
 Revision 1.1  2003/11/02 01:01:25  qboosh
 - new
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/starlink-htx.spec?r1=1.3&r2=1.4&f=u