packages: ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec - rel 4 - if program res...

[baggins]

Author: baggins                      Date: Tue Sep 27 16:24:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- if program resides in /sbin then all its libs must be in /lib

---- Files affected:
packages/ntfs-3g_ntfsprogs:
   ntfs-3g_ntfsprogs.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec
diff -u packages/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec:1.12 packages/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec:1.13
--- packages/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec:1.12	Sat Jul 30 09:13:01 2011
+++ packages/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec	Tue Sep 27 18:24:44 2011
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Sterownik do NTFS umożliwiający odczyt i zapis
 Name:		ntfs-3g_ntfsprogs
 Version:	2011.4.12
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPL v2+
 Group:		Applications/System
@@ -182,10 +182,18 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/udev/rules.d
+install -d $RPM_BUILD_ROOT{/%{_lib},/lib/udev/rules.d}
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+mv -f $RPM_BUILD_ROOT%{_libdir}/libntfs-3g.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libntfs-3g.so
+ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libntfs-3g.so.*.*) \
+	$RPM_BUILD_ROOT%{_libdir}/libntfs-3g.so
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libntfs-3g.la
+
 # mount.ntfs-3g manpage fix
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/mount.ntfs-3g.8
 echo ".so ntfs-3g.8" > $RPM_BUILD_ROOT%{_mandir}/man8/mount.ntfs-3g.8
@@ -251,13 +259,12 @@
 
 %files -n ntfs-3g-libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libntfs-3g.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libntfs-3g.so.81
+%attr(755,root,root) /%{_lib}/libntfs-3g.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libntfs-3g.so.81
 
 %files -n ntfs-3g-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libntfs-3g.so
-%{_libdir}/libntfs-3g.la
 %{_includedir}/ntfs-3g
 %{_pkgconfigdir}/libntfs-3g.pc
 
@@ -275,6 +282,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2011/09/27 16:24:44  baggins
+- rel 4
+- if program resides in /sbin then all its libs must be in /lib
+
 Revision 1.12  2011/07/30 07:13:01  qboosh
 - enabled POSIX ACLs and xattr mappings
 - BR: libuuid-devel (for ntfsprogs)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.spec?r1=1.12&r2=1.13&f=u