SPECS: xen.spec - python packaging fixes (merge from XEN_3_0_2)

glen glen at pld-linux.org
Sun Apr 27 12:06:24 CEST 2008


Author: glen                         Date: Sun Apr 27 10:06:24 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- python packaging fixes (merge from XEN_3_0_2)

---- Files affected:
SPECS:
   xen.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: SPECS/xen.spec
diff -u SPECS/xen.spec:1.60 SPECS/xen.spec:1.61
--- SPECS/xen.spec:1.60	Sat Apr 26 23:12:35 2008
+++ SPECS/xen.spec	Sun Apr 27 12:06:19 2008
@@ -174,19 +174,14 @@
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/xend-db/{domain,vnet}
 install -d $RPM_BUILD_ROOT%{_sharedstatedir}/xen/save
 
-rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
-
-%{py_comp} $RPM_BUILD_ROOT%{py_sitedir}
-%{py_ocomp} $RPM_BUILD_ROOT%{py_sitedir}
-%{py_comp} $RPM_BUILD_ROOT%{py_sitescriptdir}
-%{py_ocomp} $RPM_BUILD_ROOT%{py_sitescriptdir}
-
 cp -a dist/install/etc/udev $RPM_BUILD_ROOT%{_sysconfdir}
 cp -a dist/install/etc/hotplug $RPM_BUILD_ROOT%{_sysconfdir}
 
-# remove unneeded files
-#find $RPM_BUILD_ROOT%{py_sitedir} -name '*.py' -exec rm "{}" ";"
-#find $RPM_BUILD_ROOT%{py_sitescriptdir} -name '*.py' -exec rm "{}" ";"
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+
+%py_postclean
+rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
 rm -rf $RPM_BUILD_ROOT%{_docdir}/xen
 rm -rf $RPM_BUILD_ROOT/etc/init.d
 rm -f $RPM_BUILD_ROOT/boot/xen-3.2.gz
@@ -241,21 +236,20 @@
 %{_datadir}/xen
 %{py_sitedir}/fsimage.so
 %{py_sitedir}/grub
-%dir %{py_sitedir}/%{name}
-%dir %{py_sitedir}/%{name}/lowlevel
-%{py_sitedir}/%{name}/lowlevel/*.py*
-%attr(755,root,root) %{py_sitedir}/%{name}/lowlevel/*.so
-%{py_sitedir}/%{name}/sv
-%{py_sitedir}/%{name}/util
-%{py_sitedir}/%{name}/web
-%{py_sitedir}/%{name}/xend
-%{py_sitedir}/%{name}/xm
-%{py_sitedir}/%{name}/xsview
-%{py_sitedir}/%{name}/*.py*
+%dir %{py_sitedir}/xen
+%dir %{py_sitedir}/xen/lowlevel
+%{py_sitedir}/xen/lowlevel/*.py*
+%attr(755,root,root) %{py_sitedir}/xen/lowlevel/*.so
+%{py_sitedir}/xen/sv
+%{py_sitedir}/xen/util
+%{py_sitedir}/xen/web
+%{py_sitedir}/xen/xend
+%{py_sitedir}/xen/xm
+%{py_sitedir}/xen/xsview
+%{py_sitedir}/xen/*.py*
 %if "%{py_ver}" > "2.4"
 %{py_sitedir}/*.egg-info
 %endif
-#%{py_sitescriptdir}/*
 %{_mandir}/man?/*
 %{_sharedstatedir}/xen
 %{_sharedstatedir}/xenstored
@@ -299,6 +293,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2008-04-27 10:06:19  glen
+- python packaging fixes (merge from XEN_3_0_2)
+
 Revision 1.60  2008-04-26 21:12:35  glen
 - install hotplug, avoid duplicate packaging
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xen.spec?r1=1.60&r2=1.61&f=u



More information about the pld-cvs-commit mailing list