- conflicts before package split

Changed files:
    apache1.spec -> 1.157

diff --git a/apache1.spec b/apache1.spec
index 808d012d65d06729bd81a8c5cfc1f61bbf674203..7ee645c77f556295acb776030fa2d84e0145f7c6 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:       4
+Release:       5
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -253,6 +253,7 @@ Provides:   webserver = apache
 Obsoletes:     apache < 2.0.0
 Obsoletes:     apache-extra
 Obsoletes:     apache6
+Conflicts:     apache1 < 1.3.37-4
 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed.
 Conflicts:     rpm < 4.4.2-0.2