SPECS: webapps.spec - apache is no longer virtual, so adding confl...
glen
glen at pld-linux.org
Wed Jan 4 17:26:13 CET 2006
Author: glen Date: Wed Jan 4 16:26:13 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- apache is no longer virtual, so adding conflict on incompatible apache2
- rel 5
---- Files affected:
SPECS:
webapps.spec (1.13 -> 1.14)
---- Diffs:
================================================================
Index: SPECS/webapps.spec
diff -u SPECS/webapps.spec:1.13 SPECS/webapps.spec:1.14
--- SPECS/webapps.spec:1.13 Mon Dec 19 10:18:37 2005
+++ SPECS/webapps.spec Wed Jan 4 17:26:08 2006
@@ -3,15 +3,14 @@
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)
@@ -35,16 +34,6 @@
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
@@ -60,6 +49,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2006/01/04 16:26:08 glen
+- apache is no longer virtual, so adding conflict on incompatible apache2
+- rel 5
+
Revision 1.13 2005/12/19 09:18:37 glen
- warn user having partial upgrade that he's doomed; rel 4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/webapps.spec?r1=1.13&r2=1.14&f=u
More information about the pld-cvs-commit
mailing list