- nicely stop, without error

[packages/util-linux.git] / util-linux.spec

diff --git a/util-linux.spec b/util-linux.spec
index 2a664e44b2f4a164268b58f62eacf92dcbbf2925..b8bffb46015aedddcd5dd971da01368061ac68e4 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:       8
+Version:       2.20.1
+Release:       4
 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
@@ -47,12 +48,12 @@ Patch2:             %{name}-ctrlaltdel-man.patch
 Patch3:                %{name}-fdformat-ide.patch
 Patch4:                %{name}-fhs.patch
 Patch5:                %{name}-hotkeys.patch
-Patch6:                %{name}-pl.po-update.patch
 Patch7:                %{name}-login-lastlog.patch
 Patch8:                %{name}-procpartitions.patch
 Patch9:                %{name}-swaponsymlink.patch
 Patch10:       %{name}-diet.patch
 Patch11:       no-openat.patch
+Patch12:       %{name}-build.patch
 URL:           http://userweb.kernel.org/~kzak/util-linux/
 BuildRequires: audit-libs-devel >= 1.0.6
 BuildRequires: autoconf >= 2.60
@@ -83,6 +84,7 @@ BuildRequires:        glibc-static
        %endif
 %endif
 Requires:      pam >= %{pam_ver}
+Requires:      libblkid = %{version}-%{release}
 Provides:      fdisk
 Provides:      linux32
 Provides:      sparc32
@@ -93,7 +95,7 @@ Obsoletes:    rawdevices
 Obsoletes:     schedutils
 Obsoletes:     setarch
 Obsoletes:     sparc32
-Obsoletes:     util-linux-ng < 2.20
+Obsoletes:     util-linux-ng < 2.20-1
 Obsoletes:     util-linux-suids
 Conflicts:     SysVinit < 2.86-26
 Conflicts:     upstart-SysVinit < 2.86-28
@@ -260,7 +262,9 @@ Summary(ru.UTF-8):  Программы для монтирования и раз
 Summary(tr.UTF-8):     Dosya sistemlerini bağlamak ve çözmek için programlar
 Summary(uk.UTF-8):     Програми для монтування та розмонтування файлових систем
 Group:         Applications/System
+Requires:      libmount = %{version}-%{release}
 Conflicts:     nfs-utils-common < 1.1.3-3
+Conflicts:     SysVinit < 2.86-26
 
 %description -n mount
 mount is used for adding new filesystems, both local and networked, to
@@ -321,7 +325,7 @@ sisteminizin işlevselliği açısından kritiktir.
 Summary:       chkdupexe - find duplicate executables
 Summary(pl.UTF-8):     chkdupexe odszukuje powtarzające się pliki uruchamialne
 Group:         Applications/System
-Obsoletes:     util-linux-ng-chkdupexe < 2.20
+Obsoletes:     util-linux-ng-chkdupexe < 2.20-1
 
 %description chkdupexe
 chkdupexe will scan the union of $PATH and a hardcoded list of common
@@ -393,7 +397,7 @@ Summary(pl.UTF-8):  Biblioteka do obsługi identyfikacji urządzeń
 License:       LGPL v2.1+
 Group:         Libraries
 Requires:      libuuid = %{version}-%{release}
-Obsoletes:     util-linux-ng-libs < 2.20
+Obsoletes:     util-linux-ng-libs < 2.20-1
 
 %description -n libblkid
 Library to handle device identification and token extraction.
@@ -408,7 +412,7 @@ License:    LGPL v2.1+
 Group:         Development/Libraries
 Requires:      libblkid = %{version}-%{release}
 Requires:      libuuid-devel = %{version}-%{release}
-Obsoletes:     util-linux-ng-devel < 2.20
+Obsoletes:     util-linux-ng-devel < 2.20-1
 
 %description -n libblkid-devel
 Header files for blkid library.
@@ -423,7 +427,7 @@ License:    LGPL v2.1+
 Group:         Development/Libraries
 Requires:      libblkid-devel = %{version}-%{release}
 Requires:      libuuid-static = %{version}-%{release}
-Obsoletes:     util-linux-ng-static < 2.20
+Obsoletes:     util-linux-ng-static < 2.20-1
 
 %description -n libblkid-static
 Static library to handle device identification and token extraction.
@@ -593,6 +597,7 @@ Statyczna wersja biblioteki mount dla dietlibc.
 Summary:       Check and repair a Linux file system
 Summary(pl.UTF-8):     Sprawdzanie i naprawa linuksowego systemu plików
 Group:         Applications/System
+Requires:      libblkid = %{version}-%{release}
 
 %description -n fsck
 Check and repair a Linux file system.
@@ -604,7 +609,7 @@ Sprawdzanie i naprawa linuksowego systemu plików.
 Summary:       blkid - initrd version
 Summary(pl.UTF-8):     blkid - wersja dla initrd
 Group:         Base
-Obsoletes:     util-linux-ng-initrd < 2.20
+Obsoletes:     util-linux-ng-initrd < 2.20-1
 Conflicts:     geninitrd < 10000.10
 
 %description initrd
@@ -623,7 +628,6 @@ etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-#%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -631,6 +635,7 @@ etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd.
 %if %{without partx}
 %patch11 -p1
 %endif
+%patch12 -p1
 
 %if "%{pld_release}" != "ac"
 sed -i -e 's/-lncursesw/-lncursesw -ltinfow/' configure.ac
@@ -661,6 +666,7 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
        --disable-shared \
        --enable-static \
        --disable-fsck \
+       --disable-libmount \
        --disable-login-utils \
        --disable-schedutils \
        --disable-silent-rules \
@@ -676,7 +682,7 @@ sed -i -e 's/#define HAVE_WIDECHAR 1//' config.h
 
 sed -i -e 's/ cal\$(EXEEXT) / /; s/ lsblk\$(EXEEXT)//' misc-utils/Makefile
 
-for dir in libblkid libmount libuuid disk-utils misc-utils fsck fdisk schedutils hwclock; do
+for dir in libblkid libuuid disk-utils misc-utils fsck fdisk schedutils hwclock; do
        %{__make} -C $dir \
        %if %{with uClibc}
                LDFLAGS="-Wl,-static"
@@ -1411,12 +1417,6 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libmount.a
 
-%if %{with initrd} && %{with dietlibc}
-%files -n libmount-dietlibc
-%defattr(644,root,root,755)
-%{dietlibdir}/libmount.a
-%endif
-
 %files -n fsck
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/fsck