Author: goetz
Date: Tue Jan 30 18:59:27 2007
New Revision: 115557

Modified:
   packages/cooker/libuser/current/SPECS/libuser.spec

Log:
fix devel package conflicting with the main one


Modified: packages/cooker/libuser/current/SPECS/libuser.spec
==============================================================================
--- packages/cooker/libuser/current/SPECS/libuser.spec  (original)
+++ packages/cooker/libuser/current/SPECS/libuser.spec  Tue Jan 30 18:59:27 2007
@@ -4,7 +4,7 @@
 Summary:       A user and group account administration library
 Name:          libuser
 Version:       0.54.5
-Release:       %mkrel 1
+Release:       %mkrel 2
 License:       LGPL
 Group:         System/Configuration/Other
 URL:           http://qa.mandriva.com/
@@ -94,7 +94,8 @@
 
 # Remove unpackaged files
 rm -rf $RPM_BUILD_ROOT/usr/share/man/man3/userquota.3 \
-       %buildroot%{_libdir}/python%{pyver}/site-packages/*a
+       %buildroot%{py_platsitedir}/*a \
+       %buildroot%_libdir/%name/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -109,16 +110,17 @@
 %config(noreplace) %{_sysconfdir}/libuser.conf
 %attr(0755,root,root) %{_bindir}/*
 %attr(0755,root,root) %{_sbindir}/*
+%dir %{_libdir}/%{name}/
 %attr(0755,root,root) %{_libdir}/%{name}/libuser_files.so
 %attr(0755,root,root) %{_libdir}/%{name}/libuser_shadow.so
 %_mandir/man5/*
 %{_mandir}/man1/*
 
 %files -n %{libname}
-%attr(0755,root,root) %{_libdir}/*.so.*
+%attr(0755,root,root) %{_libdir}/libuser.so.%{major}*
 
 %files -n %{name}-python
-%attr(0755,root,root) %{_libdir}/python%{pyver}/site-packages/*.so
+%attr(0755,root,root) %{py_platsitedir}/*.so
 
 %files -n %{name}-ldap
 %attr(0755,root,root) %{_libdir}/%{name}/libuser_ldap.so
@@ -128,8 +130,7 @@
 %attr(0755,root,root) %dir %{_includedir}/libuser
 %attr(0644,root,root) %{_includedir}/libuser/*
 %attr(0644,root,root) %{_libdir}/*.la
-%attr(0755,root,root) %{_libdir}/*.so
-%attr(0755,root,root) %{_libdir}/libuser/
+%{_libdir}/*.so
 #%attr(0644,root,root) %{_mandir}/man3/*
 %attr(0644,root,root) %{_libdir}/pkgconfig/*
 

Reply via email to