rpms/util-linux-ng/devel .cvsignore, 1.27, 1.28 sources, 1.27, 1.28 util-linux-ng-2.16-blkid-cachefile.patch, 1.2, 1.3 util-linux-ng.spec, 1.78, 1.79
kzak
kzak at fedoraproject.org
Tue Jun 8 08:06:16 UTC 2010
Author: kzak
Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22504
Modified Files:
.cvsignore sources util-linux-ng-2.16-blkid-cachefile.patch
util-linux-ng.spec
Log Message:
* Tue Jun 8 2010 Karel Zak <kzak at redhat.com> 2.18-0.1
- upgrade to the release 2.18-rc1
ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ReleaseNotes
ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-rc1-ChangeLog
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore 12 Apr 2010 15:02:58 -0000 1.27
+++ .cvsignore 8 Jun 2010 08:06:15 -0000 1.28
@@ -1,2 +1,2 @@
floppy-0.16.tar.bz2
-util-linux-ng-2.17.2.tar.bz2
+util-linux-ng-2.18-rc1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources 12 Apr 2010 15:02:58 -0000 1.27
+++ sources 8 Jun 2010 08:06:15 -0000 1.28
@@ -1,2 +1,2 @@
7eeb9a6f7a258174bf0fa80f1370788d floppy-0.16.tar.bz2
-4635725a3eef1c57090bac8ea5e082e6 util-linux-ng-2.17.2.tar.bz2
+b52575b0ce729d5e8ab50fa56877d28f util-linux-ng-2.18-rc1.tar.bz2
util-linux-ng-2.16-blkid-cachefile.patch:
misc-utils/blkid.8 | 4 ++--
misc-utils/blkid.c | 2 +-
shlibs/blkid/libblkid.3 | 6 +++---
shlibs/blkid/src/blkidP.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
Index: util-linux-ng-2.16-blkid-cachefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.16-blkid-cachefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- util-linux-ng-2.16-blkid-cachefile.patch 19 Oct 2009 12:51:04 -0000 1.2
+++ util-linux-ng-2.16-blkid-cachefile.patch 8 Jun 2010 08:06:15 -0000 1.3
@@ -1,7 +1,13 @@
-diff -up util-linux-ng-2.17-git5e51568/misc-utils/blkid.8.kzak util-linux-ng-2.17-git5e51568/misc-utils/blkid.8
---- util-linux-ng-2.17-git5e51568/misc-utils/blkid.8.kzak 2009-10-16 22:50:03.000000000 +0200
-+++ util-linux-ng-2.17-git5e51568/misc-utils/blkid.8 2009-10-19 14:31:10.000000000 +0200
-@@ -67,7 +67,7 @@ more devices.
+---
+ misc-utils/blkid.8 | 4 ++--
+ misc-utils/blkid.c | 2 +-
+ shlibs/blkid/libblkid.3 | 6 +++---
+ shlibs/blkid/src/blkidP.h | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+--- util-linux-ng-2.18-rc1.orig/misc-utils/blkid.8
++++ util-linux-ng-2.18-rc1/misc-utils/blkid.8
+@@ -81,7 +81,7 @@ same meaning as "KiB") or decimal (10^N)
Read from
.I cachefile
instead of reading from the default cache file
@@ -10,7 +16,7 @@ diff -up util-linux-ng-2.17-git5e51568/m
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 .
-@@ -190,7 +190,7 @@ Display version number and exit.
+@@ -228,7 +228,7 @@ Display version number and exit.
Write the device cache to
.I writecachefile
instead of writing it to the default cache file
@@ -19,21 +25,19 @@ diff -up util-linux-ng-2.17-git5e51568/m
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.17-git5e51568/misc-utils/blkid.c.kzak util-linux-ng-2.17-git5e51568/misc-utils/blkid.c
---- util-linux-ng-2.17-git5e51568/misc-utils/blkid.c.kzak 2009-10-16 22:50:03.000000000 +0200
-+++ util-linux-ng-2.17-git5e51568/misc-utils/blkid.c 2009-10-19 14:31:10.000000000 +0200
-@@ -62,7 +62,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"
+--- util-linux-ng-2.18-rc1.orig/misc-utils/blkid.c
++++ util-linux-ng-2.18-rc1/misc-utils/blkid.c
+@@ -65,7 +65,7 @@ static void usage(int error)
+ " [-o format] <dev> [dev ...]\n\n"
+ " %1$s -i [-s <tag>] [-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.17-git5e51568/shlibs/blkid/libblkid.3.kzak util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3
---- util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3.kzak 2009-10-16 22:50:03.000000000 +0200
-+++ util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3 2009-10-19 14:31:10.000000000 +0200
+--- util-linux-ng-2.18-rc1.orig/shlibs/blkid/libblkid.3
++++ util-linux-ng-2.18-rc1/shlibs/blkid/libblkid.3
@@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
specific block device names into configuration files.
.P
@@ -61,12 +65,11 @@ diff -up util-linux-ng-2.17-git5e51568/s
caches data extracted from each recognized block device
.TP
.I /etc/blkid.conf
-diff -up util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h.kzak util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h
---- util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h.kzak 2009-10-16 22:50:03.000000000 +0200
-+++ util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h 2009-10-19 14:32:03.000000000 +0200
-@@ -267,7 +267,7 @@ extern char *blkid_strconcat(const char
- extern int blkid_fstatat(DIR *dir, const char *dirname, const char *filename,
- struct stat *st, int nofollow);
+--- util-linux-ng-2.18-rc1.orig/shlibs/blkid/src/blkidP.h
++++ util-linux-ng-2.18-rc1/shlibs/blkid/src/blkidP.h
+@@ -279,7 +279,7 @@ extern int blkid_fstatat(DIR *dir, const
+ extern int blkid_openat(DIR *dir, const char *dirname, const char *filename,
+ int flags);
-#define BLKID_CACHE_FILE "/etc/blkid.tab"
+#define BLKID_CACHE_FILE "/etc/blkid/blkid.tab"
Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- util-linux-ng.spec 12 Apr 2010 15:02:58 -0000 1.78
+++ util-linux-ng.spec 8 Jun 2010 08:06:15 -0000 1.79
@@ -1,13 +1,13 @@
### Header
Summary: A collection of basic system utilities
Name: util-linux-ng
-Version: 2.17.2
-Release: 1%{?dist}
+Version: 2.18
+Release: 0.1%{?dist}
License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ 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}
@@ -32,9 +32,10 @@ BuildRequires: pam-devel
BuildRequires: texinfo
BuildRequires: zlib-devel
BuildRequires: popt-devel
+BuildRequires: libutempter-devel
### Sources
-Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/util-linux-ng-%{upstream_version}.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/util-linux-ng-%{upstream_version}.tar.bz2
Source1: util-linux-ng-login.pamd
Source2: util-linux-ng-remote.pamd
Source3: util-linux-ng-chsh-chfn.pamd
@@ -43,7 +44,7 @@ Source5: mount.tmpfs
Source8: nologin.c
Source9: nologin.8
Source10: uuidd.init
-Source11: floppy-%{floppyver}.tar.bz2
+Source11: http://dl.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.bz2
### Obsoletes & Conflicts & Provides
%ifarch alpha
@@ -104,15 +105,6 @@ Patch7: util-linux-ng-2.13-login-lastlog
# 231192 - ipcs is not printing correct values on pLinux
Patch8: util-linux-ng-2.15-ipcs-32bit.patch
-### Upstream Patches
-###
-# 533874 - RFE: libblkid should allow the developer to ask for scanning of slow devices (eg. cdroms)
-Patch9: util-linux-ng-2.17-blkid-removable.patch
-# 575734 - use microsecond resolution for blkid cache entries
-Patch10: util-linux-ng-2.17-blkid-usec.patch
-# 580296 - "rtcwake" does miss the "off" option
-Patch11: util-linux-ng-2.17-rtcwake-off.patch
-
%description
The util-linux-ng package contains a large variety of low-level system
utilities that are necessary for a Linux system to function. Among
@@ -124,6 +116,7 @@ program.
Summary: Block device ID library
Group: Development/Libraries
License: LGPLv2+
+Requires: libuuid = %{version}-%{release}
%description -n libblkid
This is block device identification library, part of util-linux-ng.
@@ -133,7 +126,6 @@ This is block device identification libr
Summary: Block device ID library
Group: Development/Libraries
License: LGPLv2+
-#Provides: libblkid-static = %{version}-%{release}
Requires: libblkid = %{version}-%{release}
Requires: pkgconfig
@@ -163,7 +155,6 @@ See also the "uuid" package, which is a
Summary: Universally unique ID library
Group: Development/Libraries
License: BSD
-#Provides: libuuid-static = %{version}-%{release}
Requires: libuuid = %{version}-%{release}
Requires: pkgconfig
@@ -205,9 +196,6 @@ cp %{SOURCE8} %{SOURCE9} .
%patch5 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
%build
unset LINGUAS || :
@@ -230,6 +218,7 @@ export SUID_LDFLAGS="-pie"
%endif
--with-selinux \
--with-audit \
+ --with-utempter \
--disable-makeinstall-chown
# build util-linux-ng
@@ -335,10 +324,10 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/cytune $
# unsupported on s390
%ifarch s390 s390x
for I in /usr/{bin,sbin}/{fdformat,tunelp,floppy} \
- %{_mandir}/man8/{fdformat,tunelp,floppy}.8* \
- /sbin/{hwclock,clock} \
- /usr/sbin/hwclock \
- %{_mandir}/man8/{hwclock,clock}.8*; do
+ %{_mandir}/man8/{fdformat,tunelp,floppy}.8* \
+ /sbin/{hwclock,clock} \
+ /usr/sbin/hwclock \
+ %{_mandir}/man8/{hwclock,clock}.8*; do
rm -f $RPM_BUILD_ROOT$I
done
@@ -727,6 +716,11 @@ fi
%changelog
+* Tue Jun 8 2010 Karel Zak <kzak at redhat.com> 2.18-0.1
+- upgrade to the release 2.18-rc1
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ReleaseNotes
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-rc1-ChangeLog
+
* Mon Apr 12 2010 Karel Zak <kzak at redhat.com> 2.17.2-1
- fix #581252 - remounting tmpfs fails because of hidden rootcontext=
- fix #580296 - "rtcwake" does miss the "off" option
More information about the scm-commits
mailing list