Author: baggins Date: Wed Jul 1 20:26:06 2009 GMT Module: packages Tag: HEAD ---- Log message: - removed keytab-path patch (krb5.keytab back in /etc as of krb5 1.7) - C krb5-common < 1.7 due to above - clean up heimdal bcond
---- Files affected: packages/nfs-utils: nfs-utils.spec (1.175 -> 1.176) ---- Diffs: ================================================================ Index: packages/nfs-utils/nfs-utils.spec diff -u packages/nfs-utils/nfs-utils.spec:1.175 packages/nfs-utils/nfs-utils.spec:1.176 --- packages/nfs-utils/nfs-utils.spec:1.175 Tue Jun 30 16:39:47 2009 +++ packages/nfs-utils/nfs-utils.spec Wed Jul 1 22:26:01 2009 @@ -13,7 +13,7 @@ Summary(uk.UTF-8): Утиліти для NFS та демони підтримки для NFS-сервера ядра Name: nfs-utils Version: 1.2.0 -Release: 2 +Release: 2.2 License: GPL v2 Group: Networking/Daemons Source0: http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2 @@ -32,13 +32,12 @@ Source10: nfsfs.sysconfig Patch0: %{name}-install.patch Patch1: %{name}-statdpath.patch -Patch2: %{name}-keytab-path.patch -Patch3: %{name}-subsys.patch -Patch4: %{name}-union-mount.patch -Patch5: %{name}-kerberos-ac.patch -Patch6: %{name}-no_libgssapi.patch -Patch7: %{name}-pkgconfig_ac.patch -Patch8: %{name}-heimdal_functions.patch +Patch2: %{name}-subsys.patch +Patch3: %{name}-union-mount.patch +Patch4: %{name}-kerberos-ac.patch +Patch5: %{name}-no_libgssapi.patch +Patch6: %{name}-pkgconfig_ac.patch +Patch7: %{name}-heimdal_functions.patch URL: http://nfs.sourceforge.net/ BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -72,6 +71,7 @@ Obsoletes: nfs-server Obsoletes: nfsdaemon Conflicts: kernel < 2.2.5 +Conflicts: krb5-common < 1.7 ExcludeArch: armv4l BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -113,6 +113,7 @@ Obsoletes: knfsd-clients Obsoletes: nfs-server-clients Obsoletes: nfsclient +Conflicts: krb5-common < 1.7 %description clients The nfs-server-clients package contains the showmount program. @@ -166,15 +167,12 @@ %setup -q -a1 %patch0 -p1 %patch1 -p1 -%{!?with_heimdal:%patch2 -p1} +%patch2 -p1 %patch3 -p1 %patch4 -p1 -%if %{with heimdal} -%patch5 -p1 +%{?with_heimdal:%patch5 -p1} %patch6 -p1 -%patch7 -p1 -%patch8 -p0 -%endif +%patch7 -p0 # conflict with GNU stdio extension sed -i -e 's/dprintf/dbgprintf/' support/include/ha-callout.h utils/statd/*.[ch] @@ -410,6 +408,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.176 2009/07/01 20:26:01 baggins +- removed keytab-path patch (krb5.keytab back in /etc as of krb5 1.7) +- C krb5-common < 1.7 due to above +- clean up heimdal bcond + Revision 1.175 2009/06/30 14:39:47 baggins - rel 2 - added heimdal support and bcond ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils.spec?r1=1.175&r2=1.176&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
