- rebuild against python2.5

- follow python packaging guidelines

libuser.spec

@@ -1,11 +1,11 @@
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
-%define python %(%{__python} -c "import sys; print sys.version[:3]")
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: libuser
 Version: 0.54.8
-Release: 1
+Release: 2
 Group: System Environment/Base
 License: LGPL
 Source: libuser-%{version}.tar.gz
@@ -58,8 +58,8 @@ LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:${LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
 # Verify that all python modules load, just in case.
-pushd $RPM_BUILD_ROOT/%{_libdir}/python%{python}/site-packages/
-python%{python} -c "import libuser"
+pushd $RPM_BUILD_ROOT/%{python_sitearch}
+python -c "import libuser"
 popd
 
 %find_lang %{name}
@@ -74,7 +74,7 @@ popd
 %config(noreplace) %{_sysconfdir}/libuser.conf
 
 %attr(0755,root,root) %{_bindir}/*
-%{_libdir}/python%{python}/site-packages/*.so
+%{python_sitearch}/site-packages/*.so
 %{_libdir}/*.so.*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so
@@ -84,7 +84,7 @@ popd
 
 %exclude %{_libdir}/*.la
 %exclude %{_libdir}/%{name}/*.la
-%exclude %{_libdir}/python%{python}/site-packages/*.la
+%exclude %{python_sitearch}/*.la
 
 %files devel
 %defattr(-,root,root)
@@ -95,6 +95,10 @@ popd
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Dec  7 2006 Jeremy Katz <katzj@redhat.com> - 0.54.8-2
+- rebuild against python2.5
+- follow python packaging guidelines
+
 * Thu Nov  2 2006 Miloslav Trmac <mitr@redhat.com> - 0.54.8-1
 - Add importing of HOME from default/useradd
   Related: #204707