From 85347f849551e0ce08e9ee5491c6b0e0ec9b24c0be88f4fa129989b516dfb167 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 26 Aug 2011 08:33:36 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/util-linux revision 127.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=bd143c53aeca2c6bba6845e3b58df502 --- util-linux.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-linux.spec b/util-linux.spec index c2c3f51..42a3317 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -38,7 +38,7 @@ BuildRequires: zlib-devel # these tools as well #!BuildIgnore: pwdutils Version: 2.19.91 -Release: 4 +Release: 6 Url: http://kernel.org/~kzak/util-linux/ Supplements: filesystem(minix) Provides: fsck-with-dev-lock = %{version} From 883504431672ced903cdc38344921146c4e393ed51069df22b3f320120be0901 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Tue, 30 Aug 2011 08:14:19 +0000 Subject: [PATCH 2/3] update to 2.20 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=88 --- util-linux-2.20-rc2.tar.bz2 | 3 --- util-linux-2.20.tar.bz2 | 3 +++ util-linux.changes | 7 +++++++ util-linux.spec | 10 +++++----- 4 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 util-linux-2.20-rc2.tar.bz2 create mode 100644 util-linux-2.20.tar.bz2 diff --git a/util-linux-2.20-rc2.tar.bz2 b/util-linux-2.20-rc2.tar.bz2 deleted file mode 100644 index 2016dbf..0000000 --- a/util-linux-2.20-rc2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcdbb6413ef6a83c44e7e79db41cbd8ea7f0990781c12591e4e2339582c4397c -size 4510886 diff --git a/util-linux-2.20.tar.bz2 b/util-linux-2.20.tar.bz2 new file mode 100644 index 0000000..7d38178 --- /dev/null +++ b/util-linux-2.20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1cffbf5a1a7a32965f2e8e9ce76336310031e10b87c418d0679075724271d4c +size 4615091 diff --git a/util-linux.changes b/util-linux.changes index 07d907b..91eac4c 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 29 14:57:57 UTC 2011 - puzel@suse.com + +- update to util-linux-2.20 + - cleanups, bugfixes +- build with --enable-ddate + ------------------------------------------------------------------- Thu Aug 25 14:12:15 UTC 2011 - rguenther@novell.com diff --git a/util-linux.spec b/util-linux.spec index 42a3317..10a6da0 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -19,7 +19,6 @@ %define time_ver 1.7 %define which_ver 2.20 %define adjtimex_ver 1.28 -%define util_linux_tar_ver 2.20-rc2 Name: util-linux BuildRequires: audit-devel @@ -31,14 +30,14 @@ BuildRequires: pam-devel BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: zlib-devel +Version: 2.20 +Release: 2 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole # ldap stack into it. Avoid this whole mess which is done only to # make the rpm install check of uuidd happy which has support to work without # these tools as well #!BuildIgnore: pwdutils -Version: 2.19.91 -Release: 6 Url: http://kernel.org/~kzak/util-linux/ Supplements: filesystem(minix) Provides: fsck-with-dev-lock = %{version} @@ -50,7 +49,7 @@ Group: System/Base AutoReqProv: on Recommends: %{name}-lang = %{version} Summary: A collection of basic system utilities -Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v20/%{name}-%{util_linux_tar_ver}.tar.bz2 +Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v20/%{name}-%{version}.tar.bz2 Source1: util-linux-rpmlintrc # XXX: make nologin part of login package Source2: nologin.c @@ -185,7 +184,7 @@ Files to develop applications using the libmount library. %lang_package %prep -%setup -q -a 9 -b 11 -b 12 -b 13 -n %{name}-%{util_linux_tar_ver} +%setup -q -a 9 -b 11 -b 12 -b 13 %patch1 -p1 %patch2 -p1 @@ -262,6 +261,7 @@ CFLAGS="%{optflags}" \ --enable-write \ --enable-line \ --enable-libmount-mount \ + --enable-ddate \ --disable-mountpoint \ --disable-use-tty-group \ --disable-static \ From 4959192629ed9aa709936ae0ba70c09b16e4e5abe8b590860ea8db80f0794e3e Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Tue, 30 Aug 2011 08:23:29 +0000 Subject: [PATCH 3/3] sfdisk manpage fix OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=89 --- util-linux-sfdisk-manpage-fix.patch | 24 ++++++++++++++++++++++++ util-linux.changes | 1 + util-linux.spec | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 util-linux-sfdisk-manpage-fix.patch diff --git a/util-linux-sfdisk-manpage-fix.patch b/util-linux-sfdisk-manpage-fix.patch new file mode 100644 index 0000000..63753d4 --- /dev/null +++ b/util-linux-sfdisk-manpage-fix.patch @@ -0,0 +1,24 @@ +From 398e8b40dbca3a5f172485d4701554c2a08e04d6 Mon Sep 17 00:00:00 2001 +From: Petr Uzel +Date: Tue, 30 Aug 2011 10:16:19 +0200 +Subject: [PATCH] sfdisk.8: fix formatting + + +Signed-off-by: Petr Uzel +--- + fdisk/sfdisk.8 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +Index: util-linux-2.20/fdisk/sfdisk.8 +=================================================================== +--- util-linux-2.20.orig/fdisk/sfdisk.8 ++++ util-linux-2.20/fdisk/sfdisk.8 +@@ -237,7 +237,7 @@ For example: + .fi + first reports that /dev/hdb5 has Id 6, and then changes that into 83. + .TP +-.BR \-u ", " \-\-unit " \fI\letter\fR" ++.BR \-u ", " \-\-unit " \fIletter\fR" + Interpret the input and show the output in the units specified by + .IR letter . + This \fIletter\fR can be one of S, C, B or M, meaning Sectors, Cylinders, diff --git a/util-linux.changes b/util-linux.changes index 91eac4c..405f49c 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -4,6 +4,7 @@ Mon Aug 29 14:57:57 UTC 2011 - puzel@suse.com - update to util-linux-2.20 - cleanups, bugfixes - build with --enable-ddate +- add util-linux-sfdisk-manpage-fix.patch ------------------------------------------------------------------- Thu Aug 25 14:12:15 UTC 2011 - rguenther@novell.com diff --git a/util-linux.spec b/util-linux.spec index 10a6da0..ef09f66 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -86,6 +86,7 @@ Source51: blkid.conf Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch # crypto patch Patch2: util-linux-2.17.1-mount_losetup_crypto.patch +Patch3: util-linux-sfdisk-manpage-fix.patch ## ## adjtimex @@ -187,6 +188,7 @@ Files to develop applications using the libmount library. %setup -q -a 9 -b 11 -b 12 -b 13 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # cd adjtimex-*