Author: glen Date: Fri Sep 29 21:40:44 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - conflict before package split
---- Files affected: SPECS: apache1.spec (1.151 -> 1.152) ---- Diffs: ================================================================ Index: SPECS/apache1.spec diff -u SPECS/apache1.spec:1.151 SPECS/apache1.spec:1.152 --- SPECS/apache1.spec:1.151 Fri Sep 29 21:49:22 2006 +++ SPECS/apache1.spec Fri Sep 29 23:40:39 2006 @@ -29,7 +29,7 @@ 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 @@ -119,6 +119,7 @@ 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 @@ -2447,6 +2448,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.152 2006/09/29 21:40:39 glen +- conflict before package split + Revision 1.151 2006/09/29 19:49:22 glen - add mod_dir to apache1 metapackage; rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.151&r2=1.152&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
