SPECS: audit.spec - reverted last change (/usr/lib/python2.4/site-...

sparky sparky at pld-linux.org
Wed Sep 13 17:47:31 CEST 2006


Author: sparky                       Date: Wed Sep 13 15:47:31 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reverted last change (/usr/lib/python2.4/site-packages is a hardcoded path)
- move *.py to correct place if %{py_sitedit} does not match (not tested)

---- Files affected:
SPECS:
   audit.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/audit.spec
diff -u SPECS/audit.spec:1.29 SPECS/audit.spec:1.30
--- SPECS/audit.spec:1.29	Wed Sep 13 17:18:20 2006
+++ SPECS/audit.spec	Wed Sep 13 17:47:26 2006
@@ -156,6 +156,10 @@
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/auditd
 
 %if %{with python}
+if [ "%{py_sitedir}" != "/usr/lib/python2.4/site-packages" ]; then
+install -d $RPM_BUILD_ROOT%{py_sitedir}
+mv $RPM_BUILD_ROOT/usr/lib/python2.4/site-packages/* $RPM_BUILD_ROOT%{py_sitedir}
+fi
 %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
@@ -164,7 +168,7 @@
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.py
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
 %else
-rm -r $RPM_BUILD_ROOT%{py_libdir}
+rm -r $RPM_BUILD_ROOT/usr/lib/python2.4
 %endif
 
 %clean
@@ -234,6 +238,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2006/09/13 15:47:26  sparky
+- reverted last change (/usr/lib/python2.4/site-packages is a hardcoded path)
+- move *.py to correct place if %{py_sitedit} does not match (not tested)
+
 Revision 1.29  2006/09/13 15:18:20  glen
 - lib64 safe
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/audit.spec?r1=1.29&r2=1.30&f=u



More information about the pld-cvs-commit mailing list