- up to 2.20.1 (builds but not without dietlibc since diet does not support %m/%a...

Changed files:
    util-linux-blockdev.init -> 1.19
    util-linux-pl.po-update.patch -> 1.3
    util-linux.spec -> 1.329

diff --git a/util-linux-blockdev.init b/util-linux-blockdev.init
index 5806f4b60dd9daa2ab7815bb76903fc9f5a532a9..e66fd292a36baf2cedb08bd4d9aba848d614d412 100644 (file)
--- a/util-linux-blockdev.init
+++ b/util-linux-blockdev.init
@@ -6,8 +6,6 @@
 # description: blockdev
 #
 # processname: blockdev
-# config:
-# pidfile:
 
 [ -f /etc/sysconfig/blockdev ] || exit 0
 

diff --git a/util-linux-pl.po-update.patch b/util-linux-pl.po-update.patch
index affc080a9699cb9e5a0088fd34f76e757d5fa1d4..0d7be5a2b92ca999356ec62817c0f28705aabf9a 100644 (file)
--- a/util-linux-pl.po-update.patch
+++ b/util-linux-pl.po-update.patch
@@ -7,7 +7,7 @@
 -"Project-Id-Version: util-linux 2.20-rc2\n"
 +"Project-Id-Version: util-linux 2.20\n"
  "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
- "POT-Creation-Date: 2011-08-29 12:13+0200\n"
+ "POT-Creation-Date: 2011-10-20 10:13+0200\n"
 -"PO-Revision-Date: 2011-08-20 21:22+0200\n"
 +"PO-Revision-Date: 2011-09-07 18:50+0200\n"
  "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"

diff --git a/util-linux.spec b/util-linux.spec
index 08b13298b18b07ab4cdc4310717d6a8087b3df23..d5b2ab0bcd873480a3c6429d1673b78ba687a213 100644 (file)
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_with            uClibc          # link initrd version with static glibc instead of uClibc
+%bcond_with    uClibc          # link initrd version with static glibc instead of uClibc
 %bcond_without dietlibc        # link initrd version with dietlibc instead of uClibc
 %bcond_without selinux         # SELinux support
 %if "%{pld_release}" == "ac"
@@ -29,12 +29,13 @@ Summary(ru.UTF-8):  Набор базовых системных утилит д
 Summary(tr.UTF-8):     Temel sistem araçları
 Summary(uk.UTF-8):     Набір базових системних утиліт для Linux
 Name:          util-linux
-Version:       2.20
-Release:       10
+Version:       2.20.1
+Release:       0.1
 License:       GPL
 Group:         Applications/System
-Source0:       http://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/%{name}-%{version}.tar.bz2
-# Source0-md5: 4dcacdbdafa116635e52b977d9d0e879
+#Source0:      http://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/%{name}-%{version}.tar.bz2
+Source0:       ftp://ftp.infradead.org/pub/util-linux/v2.20/%{name}-%{version}.tar.bz2
+# Source0-md5: 079b37517fd4e002a2e6e992e8b4e361
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:       login.pamd
@@ -76,7 +77,7 @@ BuildRequires:        zlib-devel
 BuildRequires: uClibc-static >= 2:0.9.29
        %else
                %if %{with dietlibc}
-BuildRequires: dietlibc-static >= 2:0.32-14
+BuildRequires: dietlibc-static >= 2:0.32-16
                %else
 BuildRequires: glibc-static
                %endif