rpms/zope/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 zope.spec, 1.23, 1.24 needs.rebuild, 1.1, NONE

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	.cvsignore sources zope.spec 
Removed Files:
	needs.rebuild 
Log Message:
update to 2.9.4 and remove needs.rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	10 Jul 2006 13:03:07 -0000	1.12
+++ .cvsignore	30 Aug 2006 11:41:41 -0000	1.13
@@ -1,2 +1 @@
-Zope-2.9.3.tgz
-Hotfix_20060705.tar.gz
+Zope-2.9.4-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	10 Jul 2006 13:03:07 -0000	1.12
+++ sources	30 Aug 2006 11:41:41 -0000	1.13
@@ -1,2 +1 @@
-4e8b4e076cadd6eb62dd4513748cb9f9  Zope-2.9.3.tgz
-6dec58130117fd860adc7fd58f8062e7  Hotfix_20060705.tar.gz
+7d7ffe62eabc84d0c438e450e344c29f  Zope-2.9.4-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- zope.spec	2 Aug 2006 18:46:09 -0000	1.23
+++ zope.spec	30 Aug 2006 11:41:41 -0000	1.24
@@ -1,4 +1,4 @@
-%define python_minver 2.4.1
+%define python_minver 2.4.2
 
 %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.9.3
-Release: 4%{?dist}
+Version: 2.9.4
+Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-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
+Source0: http://www.zope.org/Products/Zope/2.9.4/Zope-2.9.4-final.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,16 +52,16 @@
 
 
 %prep
-%setup -q -n Zope-%{version}
-%patch0 -p1 -b .config
+%setup -q -n Zope-%{version}-final
+%patch0 -p2 -b .config
 # remove the backup, or we'll install it too...
-rm -f Zope/skel/etc/zope.conf.in.config
+rm -f skel/etc/zope.conf.in.config
 # Warning on the default index_html about python 2.4 & zope 2.8
 #%patch1 -p1 -b .pythonwarning
 
-chmod -x Zope/skel/import/README.txt
+chmod -x skel/import/README.txt
 install -pm 644 %{SOURCE4} README.Fedora
-install -pm 644 %{SOURCE5} Zope/skel/etc/logrotate.conf.in
+install -pm 644 %{SOURCE5} skel/etc/logrotate.conf.in
 
 
 %build
@@ -77,7 +77,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-rm -f docs
 
 # Create all required additional directories
 for dir in %{zope_home} %{software_home} %{instance_home}/{Products,bin,var} \
@@ -98,11 +97,11 @@
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope \
     $RPM_BUILD_ROOT%{_bindir}/zopectl \
     $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate \
-    README.Fedora Zope/skel/etc/zope.conf.in
+    README.Fedora skel/etc/zope.conf.in
 
 # Install the skel, translating paths, into the build root
-%{__python} "Zope/utilities/copyzopeskel.py" \
-     --sourcedir="Zope/skel" \
+%{__python} "utilities/copyzopeskel.py" \
+     --sourcedir="skel" \
      --targetdir="$RPM_BUILD_ROOT%{instance_home}" \
      --replace="INSTANCE_HOME:%{instance_home}" \
      --replace="SOFTWARE_HOME:%{software_home}" \
@@ -113,13 +112,13 @@
 make install
 
 # Hotfix
-tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products
+#tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/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
+# included in %%doc
+rm -rf $RPM_BUILD_ROOT%{zope_home}/doc
 
 # write version.txt
 echo "Zope %{version}-%{release}" > \
@@ -137,7 +136,7 @@
 
 
 %pre
-/usr/sbin/useradd -c "Zope user" -s /bin/false -r -d %{zope_home} \
+%{_sbindir}/useradd -c "Zope user" -s /bin/false -r -d %{zope_home} \
     %{zope_user} 2>/dev/null || :
 
 
@@ -156,7 +155,7 @@
 
 %files 
 %defattr(-, root, root, -)
-%doc Zope/doc/* README.Fedora
+%doc doc/* README.Fedora
 %config(noreplace) %{_sysconfdir}/sysconfig/zope
 %config %{_initrddir}/zope
 %config %{_sysconfdir}/cron.daily/zope-logrotate
@@ -164,7 +163,6 @@
 %dir %{zope_home}
 %{zope_home}/bin
 %{zope_home}/%{_lib}
-%{zope_home}/include
 %dir %{zope_home}/skel
 %{zope_home}/skel/bin
 %{zope_home}/skel/Extensions
@@ -175,7 +173,6 @@
 %{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
@@ -190,6 +187,9 @@
 
 
 %changelog
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.9.4-1
+- update to 2.9.4
+
 * Wed Aug  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.9.3-4
 - Security: fix world-writable permissions on logrotate config files
   and README.Fedora (#200794).


--- needs.rebuild DELETED ---