rpms/zope/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 zope-2.7.3-config.patch, 1.1, 1.2 zope.init.in, 1.4, 1.5 zope.spec, 1.19, 1.20

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	.cvsignore sources zope-2.7.3-config.patch zope.init.in 
	zope.spec 
Log Message:
- update devel and FC-5 to 2.9.3
- add Hotfix_20060705 to devel, FC-5, FC-4 and FC-3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Feb 2006 19:42:25 -0000	1.11
+++ .cvsignore	10 Jul 2006 13:03:07 -0000	1.12
@@ -1 +1,2 @@
-Zope-2.8.5-final.tgz
+Zope-2.9.3.tgz
+Hotfix_20060705.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Feb 2006 19:42:25 -0000	1.11
+++ sources	10 Jul 2006 13:03:07 -0000	1.12
@@ -1 +1,2 @@
-ead959e36894c3c31367063bce018cfb  Zope-2.8.5-final.tgz
+4e8b4e076cadd6eb62dd4513748cb9f9  Zope-2.9.3.tgz
+6dec58130117fd860adc7fd58f8062e7  Hotfix_20060705.tar.gz

zope-2.7.3-config.patch:

Index: zope-2.7.3-config.patch
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope-2.7.3-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zope-2.7.3-config.patch	9 Jan 2005 12:09:24 -0000	1.1
+++ zope-2.7.3-config.patch	10 Jul 2006 13:03:07 -0000	1.2
@@ -1,5 +1,5 @@
---- ./skel/etc/zope.conf.in.config	2004-09-28 20:08:52.000000000 +0200
-+++ ./skel/etc/zope.conf.in	2004-12-10 18:27:55.393492142 +0100
+--- ./Zope/skel/etc/zope.conf.in.config	2004-09-28 20:08:52.000000000 +0200
++++ ./Zope/skel/etc/zope.conf.in	2004-12-10 18:27:55.393492142 +0100
 @@ -138,6 +138,7 @@
  #
  #    effective-user chrism


Index: zope.init.in
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.init.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zope.init.in	21 Feb 2006 19:42:25 -0000	1.4
+++ zope.init.in	10 Jul 2006 13:03:07 -0000	1.5
@@ -73,7 +73,7 @@
 	restart
 	;;
   condrestart)
-	[ -e /var/lock/subsys/$prog ] && restart
+	$zopectl status | grep -qs "program running" && restart
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- zope.spec	21 Feb 2006 19:42:25 -0000	1.19
+++ zope.spec	10 Jul 2006 13:03:07 -0000	1.20
@@ -1,4 +1,4 @@
-%define python_minver 2.4
+%define python_minver 2.4.1
 
 %define zope_user      zope
 %define zope_group     %{zope_user}
@@ -12,13 +12,13 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.8.5
+Version: 2.9.3
 Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://zope.org/Products/Zope/2.8.5/Zope-2.8.5-final.tgz
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2005-04-05/Hotfix-20050405/Hotfix_20050405.tar.gz
+Source0: http://www.zope.org/Products/Zope/2.9.3/Zope-2.9.3.tgz
+Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -52,23 +52,23 @@
 
 
 %prep
-%setup -q -n Zope-%{version}-final #-a 10
+%setup -q -n Zope-%{version}
 %patch0 -p1 -b .config
 # remove the backup, or we'll install it too...
-rm -f skel/etc/zope.conf.in.config
+rm -f Zope/skel/etc/zope.conf.in.config
 # Warning on the default index_html about python 2.4 & zope 2.8
-%patch1 -p1 -b .pythonwarning
+#%patch1 -p1 -b .pythonwarning
 
-chmod -x skel/import/README.txt
+chmod -x Zope/skel/import/README.txt
 cp -p %{SOURCE4} README.Fedora
-cp -p %{SOURCE5} skel/etc/logrotate.conf.in
+cp -p %{SOURCE5} Zope/skel/etc/logrotate.conf.in
 
 
 %build
+rm -rf $RPM_BUILD_ROOT # Configure checks for it
 ./configure \
-  --with-python=%{__python} \
   --prefix=$RPM_BUILD_ROOT%{zope_home} \
-  --optimize
+#  --with-python=%{_bindir}/python
   
 #    --no-compile
 
@@ -98,11 +98,11 @@
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope \
     $RPM_BUILD_ROOT%{_bindir}/zopectl \
     $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate \
-    README.Fedora skel/etc/zope.conf.in
+    README.Fedora Zope/skel/etc/zope.conf.in
 
 # Install the skel, translating paths, into the build root
-%{__python} "utilities/copyzopeskel.py" \
-     --sourcedir="skel" \
+%{__python} "Zope/utilities/copyzopeskel.py" \
+     --sourcedir="Zope/skel" \
      --targetdir="$RPM_BUILD_ROOT%{instance_home}" \
      --replace="INSTANCE_HOME:%{instance_home}" \
      --replace="SOFTWARE_HOME:%{software_home}" \
@@ -113,13 +113,13 @@
 make install
 
 # Hotfix
-#cp -a Hotfix_20050405 $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
+tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
 
 chmod 700 $RPM_BUILD_ROOT%{instance_home}
 chmod 755 $RPM_BUILD_ROOT%{zope_home}
 
 # Symlink to include in the docs
-ln -sf %{zope_home}/doc docs
+#ln -sf %{zope_home}/doc docs
 
 # write version.txt
 echo "Zope %{version}-%{release}" > \
@@ -156,30 +156,32 @@
 
 %files 
 %defattr(-, root, root, -)
-%doc %{zope_home}/doc
-%doc docs README.Fedora
+%doc Zope/doc/* README.Fedora
 %config(noreplace) %{_sysconfdir}/sysconfig/zope
 %config %{_initrddir}/zope
 %config %{_sysconfdir}/cron.daily/zope-logrotate
 %attr(0755, root, root) %{_bindir}/zopectl
 %dir %{zope_home}
 %{zope_home}/bin
-%{zope_home}/import
 %{zope_home}/lib
+%{zope_home}/include
 %dir %{zope_home}/skel
 %{zope_home}/skel/bin
 %{zope_home}/skel/Extensions
 %{zope_home}/skel/import
 %{zope_home}/skel/log
+%{zope_home}/skel/lib
 %{zope_home}/skel/Products
 %{zope_home}/skel/README.txt
 %{zope_home}/skel/var
 %config %{zope_home}/skel/etc
+%{zope_home}/zopeskel
 %attr(-, %{zope_user}, %{zope_group}) %dir %{instance_home}
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Extensions
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/import
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/log
+%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/lib
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Products
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var
@@ -188,6 +190,13 @@
 
 
 %changelog
+* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.3-1
+- version 2.9.3
+- add Hotfix_20060705
+
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.9.2-1
+- version 2.9.2
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.8.5-1
 - version 2.8.5