- modification hotfix

[packages/Zope.git] / Zope.spec

diff --git a/Zope.spec b/Zope.spec
index 123b87eeb711e0d5bbe5eeea7e6ef8316ea667d0..6390126c162568d3a7cd74ca0a986e0dd965237a 100644 (file)
--- a/Zope.spec
+++ b/Zope.spec
@@ -12,13 +12,13 @@ Summary(es):        Un servidor de aplicaciones y un conjunto de herramientas para la c
 Summary(pl):   Serwer aplikacji i toolkit portalowy do tworzenia serwisów WWW
 Summary(pt_BR):        Um servidor de aplicações e um conjunto de ferramentas para construção de sites Web
 Name:          Zope
-Version:       2.7.0
-# %%define             sub_ver rc2
-Release:       6
+Version:       2.7.1
+# %%define             sub_ver b2
+Release:       4
 License:       Zope Public License (ZPL)
 Group:         Networking/Daemons
-Source0:       http://www.zope.org/Products/%{name}/%{version}/%{version}/%{name}-%{version}.tgz
-# Source0-md5: f733cd97f32411d43d372ac61eed98f4
+Source0:       http://www.zope.org/Products/%{name}/%{version}/%{name}-%{version}.tgz
+# Source0-md5: ae9d4bb3f7220dfffb6e91b42503b16c
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.logrotate
@@ -31,7 +31,6 @@ Patch0:               %{name}-default_config.patch
 Patch1:                %{name}-instance_paths.patch
 Patch2:                %{name}-pld_makefile_fix.patch
 Patch3:                %{name}-no_initgroups.patch
-Patch4:                %{name}-zdctl.patch
 URL:           http://www.zope.org/
 BuildRequires: python-devel >= 2.3.3
 BuildRequires: perl-base
@@ -49,7 +48,9 @@ Requires:     python-modules >= 2.3.3
 Requires:      python-libs >= 2.3.3
 Requires:      expat >= 1.95.7
 Requires:      python-PyXML >= 0.8.3
+Requires:      Zope-Hotfix = 040714
 %pyrequires_eq  python
+Obsoletes:     Zope-Hotfix = 040713
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                zope_dir /usr/lib/zope
@@ -87,14 +88,13 @@ eles ao inv
 
 %prep
 
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-0
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %ifarch amd64 alpha
 %patch3 -p1
 %endif
-%patch4 -p1
 
 %build
 perl -pi -e "s|data_dir\s+=\s+.*?join\(INSTANCE_HOME, 'var'\)|data_dir=INSTANCE_HOME|" lib/python/Globals.py