$ svn diff SUNWcups-manager.spec base-specs/system-config-printer.spec
Index: SUNWcups-manager.spec
===================================================================
--- SUNWcups-manager.spec (revision 19556)
+++ SUNWcups-manager.spec (working copy)
@@ -9,7 +9,6 @@
#
%include Solaris.inc
-%define pythonver 2.4
%use scp = system-config-printer.spec
Index: base-specs/system-config-printer.spec
===================================================================
--- base-specs/system-config-printer.spec (revision 19556)
+++ base-specs/system-config-printer.spec (working copy)
@@ -9,7 +9,6 @@
#
%define owner gheet
#
-%{?!pythonver:%define pythonver 2.4}
%define OSR 10483&10484:1.0.x
@@ -70,7 +69,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
%install
-python setup.py install --prefix=%{_prefix} --root=$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}
@@ -92,12 +91,22 @@
rm -rf $RPM_BUILD_ROOT/etc/xdg
# move to vendor-packages, but don't provide .pyc files
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
-rm
$RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/cupshelpers/*.pyc
-mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
- $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
-rmdir $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages
+# also deliver the same cupshelper into 2.4/vendor-packages as
hal-cups-utils
+# is not ready to move onto 2.6 yet
+mkdir -p
$RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/vendor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python2.4/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
+rm $RPM_BUILD_ROOT%{_libdir}/python2.4/site-packages/cupshelpers/*.pyc
+mv
$RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/site-packages/* \
+
$RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/vendor-packages/
+mv $RPM_BUILD_ROOT%{_libdir}/python2.4/site-packages/* \
+ $RPM_BUILD_ROOT%{_libdir}/python2.4/vendor-packages/
+
+rmdir
$RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/site-packages
+rmdir $RPM_BUILD_ROOT%{_libdir}/python2.4/site-packages
+
%clean
rm -rf $RPM_BUILD_ROOT
