SPECS: Zope3.spec - more amd64 fixes

[arekm]

Author: arekm                        Date: Fri Jan  6 12:48:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more amd64 fixes

---- Files affected:
SPECS:
   Zope3.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/Zope3.spec
diff -u SPECS/Zope3.spec:1.11 SPECS/Zope3.spec:1.12
--- SPECS/Zope3.spec:1.11	Fri Jan  6 13:20:54 2006
+++ SPECS/Zope3.spec	Fri Jan  6 13:48:29 2006
@@ -133,8 +133,7 @@
 %patch0 -p1
 %patch1 -p1
 
-cp %{SOURCE4} ./mkzope3instance
-chmod a+x ./mkzope3instance
+install -m755 %{SOURCE4} ./mkzope3instance
 
 %build
 ./configure \
@@ -151,7 +150,7 @@
 $RPM_BUILD_ROOT%{_sysconfdir}/zope3/main
 
 python install.py -q install --skip-build --home "%{zope_libdir}" --root "$RPM_BUILD_ROOT"
-mv $RPM_BUILD_ROOT%{zope_libdir}/lib/python/zope  $RPM_BUILD_ROOT%{py_sitedir}
+mv $RPM_BUILD_ROOT%{zope_libdir}/%{_lib}/python/zope  $RPM_BUILD_ROOT%{py_sitedir}
 rm $RPM_BUILD_ROOT%{zope_libdir}/zopeskel/bin/{*.bat.in,zopeservice*}
 mv $RPM_BUILD_ROOT%{zope_libdir}/zopeskel $RPM_BUILD_ROOT%{_sysconfdir}/zope3
 
@@ -163,14 +162,14 @@
 EOF
 
 # plain text
-echo "1" | PYTHONPATH="$RPM_BUILD_ROOT%{py_sitedir}:$RPM_BUILD_ROOT%{zope_libdir}/lib/python" \
+echo "1" | PYTHONPATH="$RPM_BUILD_ROOT%{py_sitedir}:$RPM_BUILD_ROOT%{zope_libdir}/%{_lib}/python" \
 	DESTDIR="$RPM_BUILD_ROOT" ./mkzope3instance main \
 -u zope:zope -s $RPM_BUILD_ROOT%{_sysconfdir}/zope3/zopeskel
 
 cat >> $RPM_BUILD_ROOT%{py_sitedir}/zope/app/__init__.py <<EOF
 import sys
-sys.path.insert(0,"%{zope_libdir}/lib/python")
-sys.path.insert(0,"%{zope_datadir}/lib/python")
+sys.path.insert(0,"%{zope_libdir}/%{_lib}/python")
+sys.path.insert(0,"%{zope_datadir}/%{_lib}/python")
 EOF
 
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}/zope
@@ -232,7 +231,7 @@
 %dir %{zope_libdir}/bin
 %attr(755,root,root) %{zope_libdir}/bin/*
 %{zope_libdir}/include
-%{zope_libdir}/lib
+%{zope_libdir}/%{_lib}
 %{zope_datadir}
 %{py_sitedir}/zope/app
 %attr(775,root,zope) %dir /var/run/zope3
@@ -280,6 +279,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/01/06 12:48:29  arekm
+- more amd64 fixes
+
 Revision 1.11  2006/01/06 12:20:54  arekm
 - fix for amd64
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Zope3.spec?r1=1.11&r2=1.12&f=u