packages: util-linux-ng/util-linux-ng.spec - added blkid.tab ghost - don't ...

[baggins]

Author: baggins                      Date: Tue May 19 14:44:21 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added blkid.tab ghost
- don't put devel shit in / !

---- Files affected:
packages/util-linux-ng:
   util-linux-ng.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: packages/util-linux-ng/util-linux-ng.spec
diff -u packages/util-linux-ng/util-linux-ng.spec:1.39 packages/util-linux-ng/util-linux-ng.spec:1.40
--- packages/util-linux-ng/util-linux-ng.spec:1.39	Tue May 19 16:16:34 2009
+++ packages/util-linux-ng/util-linux-ng.spec	Tue May 19 16:44:15 2009
@@ -434,7 +434,6 @@
 %configure \
 	--bindir=/bin \
 	--sbindir=/sbin \
-	--libdir=/%{_lib} \
 	--with-pam \
 	--with%{!?with_selinux:out}-selinux \
 	--disable-use-tty-group \
@@ -456,7 +455,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security} \
-	$RPM_BUILD_ROOT/var/lock
+	$RPM_BUILD_ROOT{/%{_lib},/var/lock}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -471,6 +470,11 @@
 
 :> $RPM_BUILD_ROOT/etc/security/blacklist.login
 :> $RPM_BUILD_ROOT/var/lock/wtmpxlock
+:> $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab
+
+mv $RPM_BUILD_ROOT%{_libdir}/libblkid.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libblkid.so.*.*.*) \
+	 $RPM_BUILD_ROOT%{_libdir}/libblkid.so
 
 ln -sf hwclock $RPM_BUILD_ROOT/sbin/clock
 echo '.so hwclock.8' > $RPM_BUILD_ROOT%{_mandir}/man8/clock.8
@@ -543,6 +547,7 @@
 %lang(ja) %{_mandir}/ja/man8/clock.8*
 %lang(ja) %{_mandir}/ja/man8/hwclock.8*
 
+%ghost %{_sysconfdir}/blkid.tab
 %attr(755,root,root) /sbin/blkid
 %attr(755,root,root) /sbin/findfs
 
@@ -1099,14 +1104,14 @@
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libblkid.so
-/%{_lib}/libblkid.la
+%attr(755,root,root) %{_libdir}/libblkid.so
+%{_libdir}/libblkid.la
 %{_includedir}/blkid
 %{_pkgconfigdir}/blkid.pc
 
 %files static
 %defattr(644,root,root,755)
-/%{_lib}/libblkid.a
+%{_libdir}/libblkid.a
 
 %if %{with initrd}
 %files initrd
@@ -1121,6 +1126,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2009/05/19 14:44:15  baggins
+- added blkid.tab ghost
+- don't put devel shit in / !
+
 Revision 1.39  2009/05/19 14:16:34  baggins
 - rel 3
 - added union mount support
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-ng.spec?r1=1.39&r2=1.40&f=u