Author: baggins Date: Wed Jun 17 11:48:13 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - conflict instead of obsoleting heimdal
---- Files affected: packages/krb5: krb5.spec (1.145 -> 1.146) ---- Diffs: ================================================================ Index: packages/krb5/krb5.spec diff -u packages/krb5/krb5.spec:1.145 packages/krb5/krb5.spec:1.146 --- packages/krb5/krb5.spec:1.145 Sat Jun 6 00:30:46 2009 +++ packages/krb5/krb5.spec Wed Jun 17 13:48:07 2009 @@ -11,7 +11,7 @@ Summary(pl.UTF-8): System Kerberos V5 Name: krb5 Version: 1.7 -Release: 1 +Release: 2 License: MIT Group: Networking Source0: http://web.mit.edu/kerberos/dist/krb5/1.7/%{name}-%{version}-signed.tar @@ -167,7 +167,7 @@ Group: Networking Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} -Obsoletes: heimdal +Conflicts: heimdal %description client Kerberos V5 Clients. @@ -202,7 +202,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} Requires: words -Obsoletes: heimdal-server +Conflicts: heimdal-server %description server Common files required by Kerberos 5 servers. @@ -344,7 +344,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: rc-inetd >= 0.8.1 Obsoletes: ftpd -Obsoletes: heimdal-ftpd +Conflicts: heimdal-ftpd %description ftpd FTP is the file transfer protocol, which is a widely used Internet @@ -362,7 +362,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: rc-inetd >= 0.8.1 Obsoletes: rshd -Obsoletes: heimdal-rshd +Conflicts: heimdal-rshd %description kshd The kshd package contains kerberized remote shell server which @@ -513,7 +513,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: keyutils-devel Requires: libcom_err-devel -Obsoletes: heimdal-devel +Conflicts: heimdal-devel %description devel Header files for Kerberos V5 libraries and development documentation. @@ -992,6 +992,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.146 2009/06/17 11:48:07 baggins +- rel 2 +- conflict instead of obsoleting heimdal + Revision 1.145 2009/06/05 22:30:46 baggins - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/krb5/krb5.spec?r1=1.145&r2=1.146&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
