rpms/util-linux-ng/devel util-linux-ng.spec, 1.52, 1.53 util-linux-ng-2.16-mount-conf.patch, 1.1, NONE

[kzak]

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4921

Modified Files:
	util-linux-ng.spec 
Removed Files:
	util-linux-ng-2.16-mount-conf.patch 
Log Message:
* Thu Jul 30 2009 Karel Zak <kzak at redhat.com> 2.16-3
- remove the mount.conf support (see #214891)



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- util-linux-ng.spec	27 Jul 2009 21:11:14 -0000	1.52
+++ util-linux-ng.spec	30 Jul 2009 21:29:42 -0000	1.53
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -96,8 +96,6 @@ Patch3: util-linux-ng-2.14-blockdev-rmpa
 Patch4: util-linux-ng-2.13-ctrlaltdel-man.patch
 # /etc/blkid.tab --> /etc/blkid/blkid.tab
 Patch5: util-linux-ng-2.16-blkid-cachefile.patch
-# 214891 - mount: move mtab locks to /var/lock
-Patch6: util-linux-ng-2.16-mount-conf.patch
 
 ### Ready for upstream?
 ###
@@ -197,7 +195,6 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 
@@ -474,7 +471,7 @@ fi
 
 %files -f %{name}.files
 %defattr(-,root,root)
-%doc */README.* NEWS AUTHORS licenses/* README* example.files/mount.conf
+%doc */README.* NEWS AUTHORS licenses/* README*
 %doc getopt/getopt-*.{bash,tcsh}
 
 %config(noreplace)	%{_sysconfdir}/pam.d/chfn
@@ -710,6 +707,9 @@ fi
 
 
 %changelog
+* Thu Jul 30 2009 Karel Zak <kzak at redhat.com> 2.16-3
+- remove the mount.conf support (see #214891)
+
 * Mon Jul 27 2009 Karel Zak <kzak at redhat.com> 2.16-2
 - fix #214891 - add mount.conf and MTAB_LOCK_DIR= option
 


--- util-linux-ng-2.16-mount-conf.patch DELETED ---