- conflict before package split

Changed files:
    apache1.spec -> 1.152

diff --git a/apache1.spec b/apache1.spec
index 8b1a81e78ce9a297c1cc7111ad976d76dfcdf5d8..771300e1863c4cb331ff6eb1355778d75d4c3fb7 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -28,7 +28,7 @@ Summary(uk):  
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache1
 Version:       1.3.37
-Release:       3
+Release:       4
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -118,6 +118,7 @@ Requires:   %{name}-mod_alias = %{version}-%{release}
 Requires:      %{name}-mod_dir = %{version}-%{release}
 Requires:      %{name}-mod_log_config = %{version}-%{release}
 Requires:      %{name}-mod_mime = %{version}-%{release}
+Conflicts:     %{name} < 1.3.37-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/apache