Thu Jun 4 15:13:21 UTC 2009

Author: kzak

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

Modified Files:
	.cvsignore sources util-linux-ng.spec 
Added Files:
	util-linux-ng-2.15-blkid-cachefile.patch 
	util-linux-ng-2.15-ipcs-32bit.patch 
Removed Files:
	util-linux-ng-2.14-dmesg-r.patch 
	util-linux-ng-2.14-fdisk-4k-I.patch 
	util-linux-ng-2.14-fdisk-4k-II.patch 
	util-linux-ng-2.14-fdisk-4k-III.patch 
	util-linux-ng-2.14-flock-segfaults.patch 
	util-linux-ng-2.14-ipcs-32bit.patch 
	util-linux-ng-2.14-login-remote.patch 
	util-linux-ng-2.14-mount-managed.patch 
	util-linux-ng-2.14-renice-n.patch 
Log Message:
* Thu Jun  4 2009 Karel Zak <kzak at redhat.com> 2.15.1-0.1
- upgrade to 2.15.1-rc1
  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-ReleaseNotes
  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-rc1-ChangeLog 
- merged patches:
  util-linux-ng-2.14-login-remote.patch
  util-linux-ng-2.14-fdisk-4k-I.patch
  util-linux-ng-2.14-fdisk-4k-II.patch
  util-linux-ng-2.14-fdisk-4k-III.patch
  util-linux-ng-2.14-dmesg-r.patch
  util-linux-ng-2.14-flock-segfaults.patch
  util-linux-ng-2.14-renice-n.patch
- new commands: lscpu, ipcmk
- remove support for "managed" and "kudzu" mount options
- cleanup spec file
- enable built-in libblkid (replacement for the old blkid from e2fsprogs)


util-linux-ng-2.15-blkid-cachefile.patch:

--- NEW FILE util-linux-ng-2.15-blkid-cachefile.patch ---
diff -up util-linux-ng-2.15.1-rc1/libs/blkid/bin/blkid.8.kzak util-linux-ng-2.15.1-rc1/libs/blkid/bin/blkid.8
--- util-linux-ng-2.15.1-rc1/libs/blkid/bin/blkid.8.kzak	2009-06-04 15:37:18.000000000 +0200
+++ util-linux-ng-2.15.1-rc1/libs/blkid/bin/blkid.8	2009-06-04 15:40:18.000000000 +0200
@@ -64,7 +64,7 @@ more devices.
 Read from
 .I cachefile
 instead of reading from the default cache file
-.IR /etc/blkid.tab .
+.IR /etc/blkid/blkid.tab .
 If you want to start with a clean cache (i.e. don't report devices previously
 scanned but not necessarily available at this time), specify
 .IR /dev/null .
@@ -179,7 +179,7 @@ Display version number and exit.
 Write the device cache to
 .I writecachefile
 instead of writing it to the default cache file
-.IR /etc/blkid.tab .
+.IR /etc/blkid/blkid.tab .
 If you don't want to save the cache to the default file, specify
 .IR /dev/null.
 If not specified it will be the same file as that given by the
diff -up util-linux-ng-2.15.1-rc1/libs/blkid/bin/blkid.c.kzak util-linux-ng-2.15.1-rc1/libs/blkid/bin/blkid.c
--- util-linux-ng-2.15.1-rc1/libs/blkid/bin/blkid.c.kzak	2009-06-04 15:40:32.000000000 +0200
+++ util-linux-ng-2.15.1-rc1/libs/blkid/bin/blkid.c	2009-06-04 15:40:55.000000000 +0200
@@ -60,7 +60,7 @@ static void usage(int error)
 		"        [-t <token>] [-w <file>] [dev ...]\n\n"
 		"  %1$s -p [-O <offset>] [-S <size>] [-o format] <dev> [dev ...]\n\n"
 		"Options:\n"
-		"  -c <file>   cache file (default: /etc/blkid.tab, /dev/null = none)\n"
+		"  -c <file>   cache file (default: /etc/blkid/blkid.tab, /dev/null = none)\n"
 		"  -h          print this usage message and exit\n"
 		"  -g          garbage collect the blkid cache\n"
 		"  -o <format> output format; can be one of:\n"
diff -up util-linux-ng-2.15.1-rc1/libs/blkid/libblkid.3.kzak util-linux-ng-2.15.1-rc1/libs/blkid/libblkid.3
--- util-linux-ng-2.15.1-rc1/libs/blkid/libblkid.3.kzak	2009-06-04 15:42:38.000000000 +0200
+++ util-linux-ng-2.15.1-rc1/libs/blkid/libblkid.3	2009-06-04 15:43:20.000000000 +0200
@@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
 specific block device names into configuration files.
 .P
 Block device information is normally kept in a cache file
-.I /etc/blkid.tab
+.I /etc/blkid/blkid.tab
 and is verified to still be valid before being returned to the user
 (if the user has read permission on the raw block device, otherwise not).
 The cache file also allows unprivileged users (normally anyone other
@@ -59,7 +59,7 @@ symlink does not match with LABEL or UUI
 .I CACHE_FILE=<path>
 Overrides the standard location of the cache file. This setting can be
 overridden by the environment variable BLKID_FILE. Default is
-.I /etc/blkid.tab.
+.I /etc/blkid/blkid.tab.
 .TP
 .I EVALUATE=<methods>
 Defines LABEL and UUID evaluation method(s). Currently, the libblkid library
@@ -77,7 +77,7 @@ from Ted Ts'o.  The library was subseque
 The low-level probing code was rewritten by Karel Zak.
 .SH FILES
 .TP 18
-.I /etc/blkid.tab
+.I /etc/blkid/blkid.tab
 caches data extracted from each recognized block device
 .TP
 .I /etc/blkid.conf
diff -up util-linux-ng-2.15.1-rc1/libs/blkid/src/blkidP.h.kzak util-linux-ng-2.15.1-rc1/libs/blkid/src/blkidP.h
--- util-linux-ng-2.15.1-rc1/libs/blkid/src/blkidP.h.kzak	2009-06-04 15:38:32.000000000 +0200
+++ util-linux-ng-2.15.1-rc1/libs/blkid/src/blkidP.h	2009-06-04 15:39:14.000000000 +0200
@@ -222,7 +222,7 @@ struct blkid_struct_cache
 extern char *blkid_strdup(const char *s);
 extern char *blkid_strndup(const char *s, const int length);
 
-#define BLKID_CACHE_FILE	"/etc/blkid.tab"
+#define BLKID_CACHE_FILE	"/etc/blkid/blkid.tab"
 #define BLKID_CONFIG_FILE	"/etc/blkid.conf"
 
 #define BLKID_ERR_IO	 5

util-linux-ng-2.15-ipcs-32bit.patch:

--- NEW FILE util-linux-ng-2.15-ipcs-32bit.patch ---
diff -up util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c.kzak util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c
--- util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c.kzak	2009-03-25 13:19:08.000000000 +0100
+++ util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c	2009-06-04 15:22:48.000000000 +0200
@@ -243,6 +243,26 @@ print_perms (int id, struct ipc_perm *ip
 		printf(" %-10d\n", ipcp->gid);
 }
 
+static unsigned long long
+shminfo_from_proc(const char *name, unsigned long def)
+{
+	char path[256];
+	char buf[64];
+	FILE *f;
+	unsigned long long res = def;
+
+	if (!name)
+		return res;
+
+	snprintf(path, sizeof(path), "/proc/sys/kernel/%s", name);
+
+	if (!(f = fopen(path, "r")))
+		return res;
+	if (fgets(buf, sizeof(buf), f))
+		res = atoll(buf);
+	fclose(f);
+	return res;
+}
 
 void do_shm (char format)
 {
@@ -266,12 +286,12 @@ void do_shm (char format)
 			return;
 		/* glibc 2.1.3 and all earlier libc's have ints as fields
 		   of struct shminfo; glibc 2.1.91 has unsigned long; ach */
-		printf (_("max number of segments = %lu\n"),
-			(unsigned long) shminfo.shmmni);
-		printf (_("max seg size (kbytes) = %lu\n"),
-			(unsigned long) (shminfo.shmmax >> 10));
+		printf (_("max number of segments = %llu\n"),
+			shminfo_from_proc("shmmni", shminfo.shmmni));
+		printf (_("max seg size (kbytes) = %llu\n"),
+			(shminfo_from_proc("shmmax", shminfo.shmmax) >> 10));
 		printf (_("max total shared memory (kbytes) = %llu\n"),
-			getpagesize() / 1024 * (unsigned long long) shminfo.shmall);
+			getpagesize() / 1024 * shminfo_from_proc("shmall", shminfo.shmall));
 		printf (_("min seg size (bytes) = %lu\n"),
 			(unsigned long) shminfo.shmmin);
 		return;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	9 Feb 2009 14:16:06 -0000	1.16
+++ .cvsignore	4 Jun 2009 15:12:50 -0000	1.17
@@ -1,2 +1,2 @@
-util-linux-ng-2.14.2.tar.bz2
+util-linux-ng-2.15.1-rc1.tar.bz2
 floppy-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	9 Feb 2009 14:16:06 -0000	1.16
+++ sources	4 Jun 2009 15:12:50 -0000	1.17
@@ -1,2 +1,2 @@
-b9d0053a22cfcbf0b9c0aa6d6eccfbc8  util-linux-ng-2.14.2.tar.bz2
+dc5eb45e38ea335fdca80aa488fffc48  util-linux-ng-2.15.1-rc1.tar.bz2
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- util-linux-ng.spec	2 Apr 2009 20:25:26 -0000	1.45
+++ util-linux-ng.spec	4 Jun 2009 15:12:50 -0000	1.46
@@ -1,13 +1,13 @@
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux-ng
-Version: 2.14.2
-Release: 8%{?dist}
+Version: 2.15.1
+Release: 0.1%{?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
 
-%define upstream_version %{version}
+%define upstream_version %{version}-rc1
 
 ### Features
 %if 0%{?rhel}
@@ -18,8 +18,6 @@ URL: ftp://ftp.kernel.org/pub/linux/util
 
 ### Macros
 %define floppyver 0.16
-%define no_hwclock_archs s390 s390x
-%define no_cfsfdisk_archs sparc sparcv9 sparc64
 %define cytune_archs %{ix86} alpha armv4l
 
 ### Paths
@@ -92,32 +90,17 @@ Patch2: util-linux-ng-2.13-floppy-generi
 ###
 # remove partitions
 Patch3: util-linux-ng-2.14-blockdev-rmpart.patch
-# RHEL/Fedora specific mount options
-Patch4: util-linux-ng-2.14-mount-managed.patch
 # 199745 - Non-existant simpleinit(8) mentioned in ctrlaltdel(8)
-Patch5: util-linux-ng-2.13-ctrlaltdel-man.patch
+Patch4: util-linux-ng-2.13-ctrlaltdel-man.patch
+# /etc/blkid.tab --> /etc/blkid/blkid.tab
+Patch5: util-linux-ng-2.15-blkid-cachefile.patch
 
 ### Ready for upstream?
 ###
-# 231192 - ipcs is not printing correct values on pLinux
-Patch6: util-linux-ng-2.14-ipcs-32bit.patch
 # 151635 - makeing /var/log/lastlog
-Patch7: util-linux-ng-2.13-login-lastlog.patch
-
-### Upstream patches (backported to the current Fedora/RHEL)
-###
-# 91174 - Patch to enabled remote service for login/pam
-Patch8: util-linux-ng-2.14-login-remote.patch
-# 218915, 487227 - fdisk 4KiB hw sectors support
-Patch9:  util-linux-ng-2.14-fdisk-4k-I.patch
-Patch10: util-linux-ng-2.14-fdisk-4k-II.patch
-Patch11: util-linux-ng-2.14-fdisk-4k-III.patch
-# Add -r options to dmesg (upstream patch)
-Patch12: util-linux-ng-2.14-dmesg-r.patch
-# 489672 - flock segfaults when file name is not given
-Patch13: util-linux-ng-2.14-flock-segfaults.patch
-# 477303 - renice doesn't support -n option
-Patch14: util-linux-ng-2.14-renice-n.patch
+Patch6: util-linux-ng-2.13-login-lastlog.patch
+# 231192 - ipcs is not printing correct values on pLinux
+Patch7: util-linux-ng-2.15-ipcs-32bit.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -125,24 +108,40 @@ utilities that are necessary for a Linux
 others, Util-linux contains the fdisk configuration tool and the login
 program.
 
+
+%package -n libblkid
+Summary: Block device ID library
+Group: Development/Libraries
+License: LGPLv2+
+
+%description -n libblkid
+This is block device identification library, part of util-linux-ng.
+
+
+%package -n libblkid-devel
+Summary: Block device ID library
+Group: Development/Libraries
+License: LGPLv2+
+Requires: libblkid = %{version}-%{release}
+Requires: pkgconfig
+
+%description -n libblkid-devel
+This is the block device identification development library and headers,
+part of util-linux-ng.
+
+
 %prep
 %setup -q -a 11 -n %{name}-%{upstream_version}
 cp %{SOURCE8} %{SOURCE9} .
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
 
 %build
 unset LINGUAS || :
@@ -153,6 +152,7 @@ export SUID_LDFLAGS="-pie"
 %configure \
 	--bindir=/bin \
 	--sbindir=/sbin \
+	--libdir=/%{_lib} \
 	--disable-wall \
 	--enable-partx \
 	--enable-login-utils \
@@ -163,7 +163,7 @@ export SUID_LDFLAGS="-pie"
 %endif
 	--with-selinux \
 	--with-audit \
-	--with-fsprobe=blkid \
+	--with-fsprobe=builtin \
 	--disable-makeinstall-chown
 
 # build util-linux-ng
@@ -185,7 +185,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,6,8,5}
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{pam.d,security/console.apps}
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{pam.d,security/console.apps,blkid}
 mkdir -p ${RPM_BUILD_ROOT}/var/log
 touch ${RPM_BUILD_ROOT}/var/log/lastlog
 chmod 0644 ${RPM_BUILD_ROOT}/var/log/lastlog
@@ -243,20 +243,48 @@ chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/su
 ln -sf ../../sbin/hwclock ${RPM_BUILD_ROOT}/usr/sbin/hwclock
 ln -sf hwclock ${RPM_BUILD_ROOT}/sbin/clock
 
+
+# remove libtool junk  (TODO)
+rm -f ${RPM_BUILD_ROOT}/%{_lib}/libblkid.la
+
+# libtool installs all libraries to --libdir=/lib, but we need 
+# devel stuff in /usr/lib  (TODO)
+rm -f ${RPM_BUILD_ROOT}/%{_lib}/libblkid.so
+mv ${RPM_BUILD_ROOT}/%{_lib}/libblkid.a ${RPM_BUILD_ROOT}%{_libdir}/
+ln -sf ../../%{_lib}/libblkid.so.1 ${RPM_BUILD_ROOT}%{_libdir}/libblkid.so
+
 # install tmpfs mount helper
 pushd ${RPM_BUILD_ROOT}/sbin
 install -m 755 %{SOURCE5} ./mount.tmpfs
 popd
 
-# Final cleanup
+# unsupported on %{ix86} alpha armv4l
 %ifnarch %cytune_archs
 rm -f $RPM_BUILD_ROOT%{_bindir}/cytune $RPM_BUILD_ROOT%{_mandir}/man8/cytune.8*
 %endif
-%ifarch %no_hwclock_archs
-rm -f $RPM_BUILD_ROOT/sbin/{hwclock,clock} $RPM_BUILD_ROOT%{_mandir}/man8/hwclock.8* $RPM_BUILD_ROOT/usr/sbin/{hwclock,clock}
-%endif
+
+# unsupported on s390
 %ifarch s390 s390x
-rm -f $RPM_BUILD_ROOT/usr/{bin,sbin}/{fdformat,tunelp,floppy} $RPM_BUILD_ROOT%{_mandir}/man8/{fdformat,tunelp,floppy}.8*
+for I in /usr/{bin,sbin}/{fdformat,tunelp,floppy} \
+         %{_mandir}/man8/{fdformat,tunelp,floppy}.8* \
+         /sbin/{hwclock,clock} \
+	 /usr/sbin/hwclock \
+         %{_mandir}/man8/hwclock.8*; do
+	
+	rm -f $RPM_BUILD_ROOT$I
+done
+%endif
+
+# unsupported on SPARCs
+%ifarch sparc sparcv9 sparc64
+for I in /sbin/sfdisk \
+	%{_mandir}/man8/sfdisk.8* \
+	%doc fdisk/sfdisk.examples \
+	/sbin/cfdisk \
+	%{_mandir}/man8/cfdisk.8*; do
+	
+	rm -f $RPM_BUILD_ROOT$I
+done
 %endif
 
 # deprecated commands
@@ -312,6 +340,7 @@ done
 # omit info/dir file
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
+
 # find MO files
 %find_lang %name
 
@@ -355,94 +384,78 @@ if [ "$1" = 0 ]; then
 fi
 exit 0
 
+
+%post -n libblkid
+/sbin/ldconfig
+[ -e /etc/blkid.tab ] && mv /etc/blkid.tab /etc/blkid/blkid.tab || :
+[ -e /etc/blkid.tab.old ] && mv /etc/blkid.tab.old /etc/blkid/blkid.tab.old || :
+
+%postun -n libblkid -p /sbin/ldconfig
+
+
 %files -f %{name}.files
 %defattr(-,root,root)
 %doc */README.* NEWS AUTHORS licenses/* README*
 %doc getopt/getopt-*.{bash,tcsh}
 
-/bin/dmesg
-%attr(755,root,root) /bin/login
-/bin/more
-/bin/kill
-/bin/taskset
-%if %{include_raw}
-/bin/raw
-%config(noreplace)	%{_sysconfdir}/udev/rules.d/60-raw.rules
-%endif
-
 %config(noreplace)	%{_sysconfdir}/pam.d/chfn
 %config(noreplace)	%{_sysconfdir}/pam.d/chsh
 %config(noreplace)	%{_sysconfdir}/pam.d/login
 %config(noreplace)	%{_sysconfdir}/pam.d/remote
 
+%attr(4755,root,root)	/bin/mount
+%attr(4755,root,root)	/bin/umount
+%attr(755,root,root)	/sbin/mount.tmpfs
+%attr(755,root,root)	/bin/login
+%attr(4711,root,root)	%{_bindir}/chfn
+%attr(4711,root,root)	%{_bindir}/chsh
+%attr(2755,root,tty)	%{_bindir}/write
+
+%ghost %attr(0644,root,root)	%verify(not md5 size mtime)	/var/log/lastlog
+
+/bin/dmesg
+/bin/kill
+/bin/more
+/bin/taskset
+/sbin/addpart
 /sbin/agetty
-%{_mandir}/man8/agetty.8*
+/sbin/blkid
 /sbin/blockdev
-/sbin/pivot_root
 /sbin/ctrlaltdel
-/sbin/addpart
 /sbin/delpart
-/sbin/partx
-%{_mandir}/man8/partx.8*
-%{_mandir}/man8/addpart.8*
-%{_mandir}/man8/delpart.8*
-
-%ifnarch %no_cfsfdisk_archs
-/sbin/sfdisk
-%{_mandir}/man8/sfdisk.8*
-%doc fdisk/sfdisk.examples
-/sbin/cfdisk
-%{_mandir}/man8/cfdisk.8*
-%endif
 /sbin/fdisk
-%{_mandir}/man8/fdisk.8*
-
-%ifnarch %no_hwclock_archs
-/sbin/clock
-/sbin/hwclock
-/usr/sbin/hwclock
-%{_mandir}/man8/hwclock.8*
-%endif
+/sbin/findfs
+/sbin/fsck.cramfs
+/sbin/losetup
 /sbin/mkfs
+/sbin/mkfs.cramfs
 /sbin/mkswap
 /sbin/nologin
-%{_mandir}/man8/nologin.8*
-%ghost %attr(0644,root,root)	%verify(not md5 size mtime)	/var/log/lastlog
-
-%{_bindir}/chrt
-%{_bindir}/ionice
+/sbin/partx
+/sbin/pivot_root
+/sbin/swapoff
+/sbin/swapon
 
 %{_bindir}/cal
-%attr(4711,root,root)	%{_bindir}/chfn
-%attr(4711,root,root)	%{_bindir}/chsh
+%{_bindir}/chrt
 %{_bindir}/col
 %{_bindir}/colcrt
 %{_bindir}/colrm
 %{_bindir}/column
-%ifarch %cytune_archs
-%{_bindir}/cytune
-%{_mandir}/man8/cytune.8*
-%endif
 %{_bindir}/ddate
-%ifnarch s390 s390x
-%{_sbindir}/fdformat
-%endif
 %{_bindir}/flock
 %{_bindir}/getopt
 %{_bindir}/hexdump
+%{_bindir}/ionice
+%{_bindir}/ipcmk
 %{_bindir}/ipcrm
 %{_bindir}/ipcs
 %{_bindir}/isosize
 %{_bindir}/kill
 %{_bindir}/logger
 %{_bindir}/look
+%{_bindir}/lscpu
 %{_bindir}/mcookie
-/sbin/fsck.cramfs
-/sbin/mkfs.cramfs
-%ifnarch s390 s390x
-%{_bindir}/floppy
-%{_mandir}/man8/floppy.8*
-%endif
 %{_bindir}/namei
 %{_bindir}/rename
 %{_bindir}/renice
@@ -452,98 +465,151 @@ exit 0
 %{_bindir}/setarch
 %{_bindir}/setsid
 %{_bindir}/setterm
-%ifarch sparc sparc64 sparcv9
-%{_bindir}/sunhostid
-%endif
 %{_bindir}/tailf
 %{_bindir}/ul
 %{_bindir}/whereis
-%attr(2755,root,tty)	%{_bindir}/write
 
+%{_sbindir}/ldattach
 %{_sbindir}/readprofile
-%ifnarch s390 s390x
-%{_sbindir}/tunelp
-%endif
 %{_sbindir}/rtcwake
-%{_sbindir}/ldattach
 
 %{_infodir}/ipc.info*
 
 %{_mandir}/man1/cal.1*
 %{_mandir}/man1/chfn.1*
+%{_mandir}/man1/chrt.1*
 %{_mandir}/man1/chsh.1*
 %{_mandir}/man1/col.1*
 %{_mandir}/man1/colcrt.1*
 %{_mandir}/man1/colrm.1*
 %{_mandir}/man1/column.1*
 %{_mandir}/man1/ddate.1*
+%{_mandir}/man1/dmesg.1*
 %{_mandir}/man1/flock.1*
 %{_mandir}/man1/getopt.1*
 %{_mandir}/man1/hexdump.1*
+%{_mandir}/man1/ionice.1*
+%{_mandir}/man1/ipcmk.1*
+%{_mandir}/man1/ipcrm.1*
+%{_mandir}/man1/ipcs.1*
 %{_mandir}/man1/kill.1*
 %{_mandir}/man1/logger.1*
 %{_mandir}/man1/login.1*
 %{_mandir}/man1/look.1*
+%{_mandir}/man1/lscpu.1*
 %{_mandir}/man1/mcookie.1*
 %{_mandir}/man1/more.1*
 %{_mandir}/man1/namei.1*
 %{_mandir}/man1/readprofile.1*
 %{_mandir}/man1/rename.1*
+%{_mandir}/man1/renice.1*
 %{_mandir}/man1/rev.1*
 %{_mandir}/man1/script.1*
 %{_mandir}/man1/scriptreplay.1*
+%{_mandir}/man1/setsid.1*
 %{_mandir}/man1/setterm.1*
 %{_mandir}/man1/tailf.1*
+%{_mandir}/man1/taskset.1*
 %{_mandir}/man1/ul.1*
 %{_mandir}/man1/whereis.1*
 %{_mandir}/man1/write.1*
 
-%{_mandir}/man1/chrt.1*
-%{_mandir}/man1/ionice.1*
-%{_mandir}/man1/taskset.1*
-%{_mandir}/man1/renice.1*
-
-%{_mandir}/man1/ipcrm.1*
-%{_mandir}/man1/ipcs.1*
-%{_mandir}/man1/setsid.1*
-%{_mandir}/man1/dmesg.1*
+%{_mandir}/man5/fstab.5*
 
+%{_mandir}/man8/addpart.8*
+%{_mandir}/man8/agetty.8*
+%{_mandir}/man8/blkid.8*
 %{_mandir}/man8/blockdev.8*
 %{_mandir}/man8/ctrlaltdel.8*
-%ifnarch s390 s390x
-%{_mandir}/man8/fdformat.8*
-%endif
+%{_mandir}/man8/delpart.8*
+%{_mandir}/man8/fdisk.8*
+%{_mandir}/man8/findfs.8*
 %{_mandir}/man8/isosize.8*
+%{_mandir}/man8/ldattach.8*
+%{_mandir}/man8/losetup.8*
 %{_mandir}/man8/mkfs.8*
 %{_mandir}/man8/mkswap.8*
+%{_mandir}/man8/mount.8*
+%{_mandir}/man8/nologin.8*
+%{_mandir}/man8/partx.8*
 %{_mandir}/man8/pivot_root.8*
+%{_mandir}/man8/rtcwake.8*
+%{_mandir}/man8/setarch.8*
+%{_mandir}/man8/swapoff.8*
+%{_mandir}/man8/swapon.8*
+%{_mandir}/man8/umount.8*
+
 %if %{include_raw}
+/bin/raw
+%config(noreplace)	%{_sysconfdir}/udev/rules.d/60-raw.rules
 %{_mandir}/man8/raw.8*
 %{_mandir}/man8/rawdevices.8*
 %endif
+
 %ifnarch s390 s390x
+/sbin/clock
+/sbin/hwclock
+%{_bindir}/floppy
+%{_sbindir}/fdformat
+%{_sbindir}/hwclock
+%{_sbindir}/tunelp
+%{_mandir}/man8/fdformat.8*
+%{_mandir}/man8/floppy.8*
+%{_mandir}/man8/hwclock.8*
 %{_mandir}/man8/tunelp.8*
 %endif
-%{_mandir}/man8/setarch.8*
-%{_mandir}/man8/rtcwake.8*
-%{_mandir}/man8/ldattach.8*
 
-%attr(4755,root,root)	/bin/mount
-%attr(4755,root,root)	/bin/umount
+%ifnarch sparc sparcv9 sparc64
+%doc fdisk/sfdisk.examples
+/sbin/cfdisk
+/sbin/sfdisk
+%{_mandir}/man8/cfdisk.8*
+%{_mandir}/man8/sfdisk.8*
+%endif
 
-%attr(755,root,root)	/sbin/mount.tmpfs
+%ifarch sparc sparc64 sparcv9
+%{_bindir}/sunhostid
+%endif
+
+%ifarch %cytune_archs
+%{_bindir}/cytune
+%{_mandir}/man8/cytune.8*
+%endif
+
+
+%files -n libblkid
+%defattr(-,root,root)
+%dir /etc/blkid
+/%{_lib}/libblkid.so.*
+
+
+%files -n libblkid-devel
+%defattr(-,root,root)
+%{_libdir}/libblkid.a
+%{_libdir}/libblkid.so
+%{_includedir}/blkid
+%{_mandir}/man3/libblkid.3*
+%{_libdir}/pkgconfig/blkid.pc
 
-/sbin/swapon
-/sbin/swapoff
-%{_mandir}/man5/fstab.5*
-%{_mandir}/man8/mount.8*
-%{_mandir}/man8/swapoff.8*
-%{_mandir}/man8/swapon.8*
-%{_mandir}/man8/umount.8*
-%{_mandir}/man8/losetup.8*
-/sbin/losetup
 
 %changelog
+* Thu Jun  4 2009 Karel Zak <kzak at redhat.com> 2.15.1-0.1
+- upgrade to 2.15.1-rc1
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-ReleaseNotes
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-rc1-ChangeLog 
+- merged patches:
+  util-linux-ng-2.14-login-remote.patch
+  util-linux-ng-2.14-fdisk-4k-I.patch
+  util-linux-ng-2.14-fdisk-4k-II.patch
+  util-linux-ng-2.14-fdisk-4k-III.patch
+  util-linux-ng-2.14-dmesg-r.patch
+  util-linux-ng-2.14-flock-segfaults.patch
+  util-linux-ng-2.14-renice-n.patch
+- new commands: lscpu, ipcmk
+- remove support for "managed" and "kudzu" mount options
+- cleanup spec file
+- enable built-in libblkid (replacement for the old blkid from e2fsprogs)
+
 * Thu Apr  2 2009 Karel Zak <kzak at redhat.com> 2.14.2-8
 - fix #490769 - %post scriptlet failed (thanks to Dan Horak)
  


--- util-linux-ng-2.14-dmesg-r.patch DELETED ---


--- util-linux-ng-2.14-fdisk-4k-I.patch DELETED ---


--- util-linux-ng-2.14-fdisk-4k-II.patch DELETED ---


--- util-linux-ng-2.14-fdisk-4k-III.patch DELETED ---


--- util-linux-ng-2.14-flock-segfaults.patch DELETED ---


--- util-linux-ng-2.14-ipcs-32bit.patch DELETED ---


--- util-linux-ng-2.14-login-remote.patch DELETED ---


--- util-linux-ng-2.14-mount-managed.patch DELETED ---


--- util-linux-ng-2.14-renice-n.patch DELETED ---


