packages: apache-mod_extract_forwarded/apache-mod_extract_forwarded.spec, a...

[blues]

Author: blues                        Date: Sat Oct 17 12:36:03 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added cross-conflicts

---- Files affected:
packages/apache-mod_extract_forwarded:
   apache-mod_extract_forwarded.spec (1.2 -> 1.3) 
packages/apache-mod_rpaf:
   apache-mod_rpaf.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/apache-mod_extract_forwarded/apache-mod_extract_forwarded.spec
diff -u packages/apache-mod_extract_forwarded/apache-mod_extract_forwarded.spec:1.2 packages/apache-mod_extract_forwarded/apache-mod_extract_forwarded.spec:1.3
--- packages/apache-mod_extract_forwarded/apache-mod_extract_forwarded.spec:1.2	Thu Oct 15 10:56:08 2009
+++ packages/apache-mod_extract_forwarded/apache-mod_extract_forwarded.spec	Sat Oct 17 14:35:57 2009
@@ -16,6 +16,8 @@
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apache(mod_proxy)
+Conflicts:	apache(mod_rpaf)
+Provides:	apache(mod_extract_forwarded)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -74,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/10/17 12:35:57  blues
+- added cross-conflicts
+
 Revision 1.2  2009/10/15 08:56:08  blues
 - mod_proxy must be loaded
 

================================================================
Index: packages/apache-mod_rpaf/apache-mod_rpaf.spec
diff -u packages/apache-mod_rpaf/apache-mod_rpaf.spec:1.16 packages/apache-mod_rpaf/apache-mod_rpaf.spec:1.17
--- packages/apache-mod_rpaf/apache-mod_rpaf.spec:1.16	Sat Dec  6 16:30:02 2008
+++ packages/apache-mod_rpaf/apache-mod_rpaf.spec	Sat Oct 17 14:35:57 2009
@@ -16,6 +16,7 @@
 BuildRequires:	apache-devel >= 2.2
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
+Conflicts:	apache(mod_extract_forwarded)
 Provides:	apache(mod_rpaf)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -78,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2009/10/17 12:35:57  blues
+- added cross-conflicts
+
 Revision 1.16  2008/12/06 15:30:02  glen
 - template-apache_module.spec
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_extract_forwarded/apache-mod_extract_forwarded.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_rpaf/apache-mod_rpaf.spec?r1=1.16&r2=1.17&f=u