From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 29 Sep 2006 21:40:39 +0000 (+0000)
Subject: - conflict before package split
X-Git-Tag: auto/ac/apache1-1_3_37-4~2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=fb85882db221ed7b7403e5c8b6db6d2e010fdad3;hp=2aa74de2e28c0ad17ebfdaa3b626bc9189cc1cfc;p=packages%2Fapache1.git

- conflict before package split

Changed files:
    apache1.spec -> 1.152
---

diff --git a/apache1.spec b/apache1.spec
index 8b1a81e..771300e 100644
--- 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