Author: qboosh Date: Sun Apr 16 17:23:44 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- libvolume_id packaging fixes (ldconfig, .so link, respect lib64)
---- Files affected:
SPECS:
udev.spec (1.165 -> 1.166)
---- Diffs:
================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.165 SPECS/udev.spec:1.166
--- SPECS/udev.spec:1.165 Sun Apr 16 13:00:56 2006
+++ SPECS/udev.spec Sun Apr 16 19:23:39 2006
@@ -185,6 +185,8 @@
%if %{with main}
%{__make} \
udevdir=/dev \
+ libdir=/%{_lib} \
+ usrlibdir=%{_libdir} \
CC="%{__cc}" \
DEBUG=%{!?debug:false}%{?debug:true} \
OPTFLAGS="%{rpmcflags}" \
@@ -204,7 +206,9 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- initdir=%{_initrddir} \
+ initdir=/etc/rc.d/init.d \
+ libdir=/%{_lib} \
+ usrlibdir=%{_libdir} \
EXTRAS="%{extras}"
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
@@ -251,6 +255,9 @@
/sbin/start_udev || exit 0
fi
+%post -n libvolume_id -p /sbin/ldconfig
+%postun -n libvolume_id -p /sbin/ldconfig
+
%if %{with main}
%files
%defattr(644,root,root,755)
@@ -320,16 +327,17 @@
%files -n libvolume_id
%defattr(644,root,root,755)
-%attr(755,root,root) /lib/lib*.so.*.*.*
+%attr(755,root,root) /%{_lib}/libvolume_id.so.*.*.*
%files -n libvolume_id-devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libvolume_id.so
%{_includedir}/*.h
%{_pkgconfigdir}/*.pc
%files -n libvolume_id-static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libvolume_id.a
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -337,6 +345,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.166 2006/04/16 17:23:39 qboosh
+- libvolume_id packaging fixes (ldconfig, .so link, respect lib64)
+
Revision 1.165 2006/04/16 11:00:56 freetz
- 090, updated file list, with_initrd broken, don't send it to builders
- unofficialy rel.1 for without_initrd parts
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/udev.spec?r1=1.165&r2=1.166&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
