Author: glen Date: Tue Oct 17 09:53:42 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - conflicts before package split
---- Files affected: SPECS: apache1.spec (1.156 -> 1.157) ---- Diffs: ================================================================ Index: SPECS/apache1.spec diff -u SPECS/apache1.spec:1.156 SPECS/apache1.spec:1.157 --- SPECS/apache1.spec:1.156 Tue Oct 3 15:34:02 2006 +++ SPECS/apache1.spec Tue Oct 17 11:53:32 2006 @@ -29,7 +29,7 @@ Summary(zh_CN): Internet ÉĎÓŚÓĂ×îšăˇşľÄ Web ˇţÎńłĚĐňĄŁ Name: apache1 Version: 1.3.37 -Release: 4 +Release: 5 License: Apache Group Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz @@ -254,6 +254,7 @@ Obsoletes: apache < 2.0.0 Obsoletes: apache-extra Obsoletes: apache6 +Conflicts: apache1 < 1.3.37-4 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed. Conflicts: rpm < 4.4.2-0.2 @@ -2451,6 +2452,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.157 2006/10/17 09:53:32 glen +- conflicts before package split + Revision 1.156 2006/10/03 13:34:02 glen - mod_auth doesn't really require htpasswd program ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.156&r2=1.157&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
