X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-linux.spec;h=b8bffb46015aedddcd5dd971da01368061ac68e4;hb=a0ec040cdc2c2871186bec6955501411c36f9f72;hp=50e07b5c78bc2c55be7cab84199a89cda2607b54;hpb=bc9462dfa503db8ead8cb527da0872b92de4a8bb;p=packages%2Futil-linux.git

diff --git a/util-linux.spec b/util-linux.spec
index 50e07b5..b8bffb4 100644
--- 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:	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
@@ -595,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.
@@ -625,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
@@ -633,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
@@ -663,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 \
@@ -678,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"
@@ -1413,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