--- a/base-specs/system-config-printer.spec	Tue Dec 15 15:50:38 2009 +0000
+++ b/base-specs/system-config-printer.spec	Tue Dec 15 17:30:05 2009 +0000
@@ -64,6 +64,8 @@
 %patch05 -p1
 
 %build
+export PYTHON=/usr/bin/python%{default_python_version}
+
 intltoolize --force --copy
 aclocal
 automake -a -c -f
@@ -72,21 +74,39 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %install
-rm -rf $RPM_BUILD_ROOT
 python%{default_python_version} setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT
 
+# move private directory from /usr/share to /usr/lib
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*.py \
+   $RPM_BUILD_ROOT%{_libdir}/%{name}
+# move troubleshoot to /ur/lib
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/troubleshoot \
+   $RPM_BUILD_ROOT%{_libdir}/%{name}
+
+# Move system-config-printer-applet to /usr/lib/%{name}
+mv $RPM_BUILD_ROOT%{_bindir}/system-config-printer-applet \
+   $RPM_BUILD_ROOT%{_libdir}/%{name}
+
+# do not deliver my-default-printer
+rm $RPM_BUILD_ROOT%{_bindir}/my-default-printer
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/my-default-printer.py
 
 # Don't need desktop files as they are shared and managed by sym links
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applications
 rm -rf $RPM_BUILD_ROOT/etc/xdg
 
 # move to vendor-packages, but don't provide .pyc files
-# also deliver the same cupshelper into 2.4/vendor-packages as hal-cups-utils
-# is not ready to move onto 2.6 yet
+# deliver cupshelper into 2.6/vendor-packages 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/vendor-packages
+rm $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/site-packages/cupshelpers/*.pyc
+rm $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/site-packages/*egg-info
+
+# hal-cups-utils uses cupshelpers and it is still 2.4 base so need to deliver 2.4 as well
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/python2.4/vendor-packages
-rm $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/site-packages/*egg-info
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python2.4/vendor-packages/cupshelpers
+cp $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/site-packages/cupshelpers/* \
+   $RPM_BUILD_ROOT%{_libdir}/python2.4/vendor-packages/cupshelpers
 
 mv $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/site-packages/* \
    $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/vendor-packages/
@@ -97,8 +117,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Thu Dec 10 2009 - [email protected]
-- Fix %files.
+* Tue Dec 15 2009 - [email protected]
+- Fix doo#13356. Move troubleshoot to %{_libdir}
+- also make a copy of cupshelpers in 2.4 vendor-packages for hal-cups-utils
+* Sun Dec 06 2009 - [email protected]
+- Remove the duplicated directory %{_datadir}/%{name}/troubleshoot
+- Remove the python2.4 lines
 * Wed Aug 12 2009 - [email protected]
 - Bump to 1.0.16.
 * Mon Jan 19 2009 - [email protected]