Author: baggins Date: Wed Jun 17 11:48:33 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - explicit conflict with krb5 programs
---- Files affected: packages/heimdal: heimdal.spec (1.156 -> 1.157) ---- Diffs: ================================================================ Index: packages/heimdal/heimdal.spec diff -u packages/heimdal/heimdal.spec:1.156 packages/heimdal/heimdal.spec:1.157 --- packages/heimdal/heimdal.spec:1.156 Mon Feb 23 23:12:54 2009 +++ packages/heimdal/heimdal.spec Wed Jun 17 13:48:27 2009 @@ -10,7 +10,7 @@ Summary(pl.UTF-8): Implementacja Heimdal systemu Kerberos V5 Name: heimdal Version: 1.2.1 -Release: 2 +Release: 3 License: Free Group: Networking Source0: http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz @@ -52,7 +52,7 @@ BuildRequires: texinfo %{?with_x11:BuildRequires: xorg-lib-libXt-devel} Requires: %{name}-libs = %{version}-%{release} -Conflicts: krb5-lib +Conflicts: krb5-client BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _libexecdir %{_sbindir} @@ -115,6 +115,7 @@ Requires: db-devel Requires: libcom_err-devel >= 1.34-5 Requires: openssl-devel +Conflicts: krb5-devel %description devel contains files needed to compile and link software using the kerberos @@ -142,6 +143,7 @@ Requires(post,preun): /sbin/chkconfig Requires: %{name}-libs = %{version}-%{release} Requires: rc-scripts +Conflicts: krb5-server %description server Master KDC. @@ -190,6 +192,7 @@ Requires: %{name}-libs = %{version}-%{release} Obsoletes: ftp Conflicts: heimdal-clients +Conflicts: krb5-ftp %description ftp The FTP package provides the standard UNIX command-line FTP client @@ -209,6 +212,7 @@ Requires: %{name}-libs = %{version}-%{release} Obsoletes: rsh Conflicts: heimdal-clients +Conflicts: krb5-rsh %description rsh The rsh package contains a set of programs which allow users to run @@ -230,6 +234,7 @@ Provides: telnet Obsoletes: telnet Conflicts: heimdal-clients +Conflicts: krb5-telnet %description telnet Telnet is a popular protocol for remote logins across the Internet. @@ -246,6 +251,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: rc-inetd >= 0.8.1 Obsoletes: ftpd +Conflicts: krb5-ftpd %description ftpd FTP is the file transfer protocol, which is a widely used Internet @@ -262,6 +268,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: rc-inetd >= 0.8.1 Obsoletes: rshd +Conflicts: krb5-rshd %description rshd The rsh package contains a set of programs which allow users to run @@ -282,6 +289,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: rc-inetd >= 0.8.1 Obsoletes: telnetd +Conflicts: krb5-telnetd %description telnetd Telnet is a popular protocol for remote logins across the Internet. @@ -686,6 +694,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.157 2009/06/17 11:48:27 baggins +- rel 3 +- explicit conflict with krb5 programs + Revision 1.156 2009/02/23 22:12:54 arekm - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.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
