- apache is no longer virtual, so adding conflict on incompatible apache2

- rel 5

Changed files:
    webapps.spec -> 1.14

diff --git a/webapps.spec b/webapps.spec
index 7afc4bd2c424c4cc957b5e84063a9bbbf383966d..ae59600e45487fe2658125234ded6a7c95cdfefd 100644 (file)
--- a/webapps.spec
+++ b/webapps.spec
@@ -2,15 +2,14 @@ Summary:      webapps framework
 Summary(pl):   Szkielet dla aplikacji WWW
 Name:          webapps
 Version:       0.2
-Release:       4
+Release:       5
 License:       GPL
 Group:         Applications/WWW
 Source0:       %{name}.sh
 Source1:       %{name}.README
 Requires:      webserver
 Conflicts:     apache1 < 1.3.34-3.2
-# can't conflict apache2 as apache1 is matched. just hope the best for now
-#Conflicts:    apache < 2.0.55-2.2
+Conflicts:     apache < 2.0.55-2.2
 Conflicts:     lighttpd < 1.4.7-2.1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -34,16 +33,6 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir}}
 install %{SOURCE0} $RPM_BUILD_ROOT%{_sbindir}/webapp
 
-%triggerin -- apache < 2.0.55-2.2
-if [ -d /etc/httpd ] && [ ! -d /etc/httpd/webapps.d ]; then
-cat >&2 << 'EOF'
-IMPORTANT:
- Your Apache 2.x is not webapps compatible!
- please upgrade your Apache 2.x installation to at least apache-2.0.55-2.2!
- (apache-2.0.55-3.2 should be in ac-ready)
-EOF
-fi
-
 %clean
 rm -rf $RPM_BUILD_ROOT