rpms/zope/devel zope.spec,1.21,1.22

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/zope/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31429

Modified Files:
	zope.spec 
Log Message:
try to fix build on x86_64 (take 2)


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- zope.spec	10 Jul 2006 16:43:37 -0000	1.21
+++ zope.spec	10 Jul 2006 17:08:47 -0000	1.22
@@ -4,7 +4,7 @@
 %define zope_group     %{zope_user}
 
 %define zope_home      %{_libdir}/zope
-%define software_home  %{zope_home}/lib/python
+%define software_home  %{zope_home}/%{_lib}/python
 %define instance_home  %{_localstatedir}/lib/zope
 
 %define zopectl        %{_bindir}/zopectl
@@ -13,7 +13,7 @@
 Name:    zope
 Summary: Web application server for flexible content management applications
 Version: 2.9.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
@@ -112,11 +112,6 @@
 # Actually copy all the other files over
 make install
 
-ls $RPM_BUILD_ROOT%{zope_home}
-ls $RPM_BUILD_ROOT%{software_home}
-ls $RPM_BUILD_ROOT%{_prefix}/lib
-ls $RPM_BUILD_ROOT%{instance_home}
-
 # Hotfix
 tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products
 
@@ -128,7 +123,7 @@
 
 # write version.txt
 echo "Zope %{version}-%{release}" > \
-    "$RPM_BUILD_ROOT%{zope_home}/lib/python/version.txt"
+    "$RPM_BUILD_ROOT%{software_home}/version.txt"
 
 # Compile .pyc
 %{__python} -c "import compileall; \
@@ -168,7 +163,7 @@
 %attr(0755, root, root) %{_bindir}/zopectl
 %dir %{zope_home}
 %{zope_home}/bin
-%{zope_home}/lib
+%{zope_home}/%{_lib}
 %{zope_home}/include
 %dir %{zope_home}/skel
 %{zope_home}/skel/bin
@@ -195,6 +190,9 @@
 
 
 %changelog
+* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-3
+- try to fix build on x86_64 (take 2)
+
 * Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-2
 - try to fix build on x86_64 (take 1)