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

diff --git a/util-linux.spec b/util-linux.spec
index 425d47f..b8bffb4 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -30,7 +30,7 @@ Summary(tr.UTF-8):	Temel sistem araçları
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux
 Version:	2.20.1
-Release:	1
+Release:	4
 License:	GPL
 Group:		Applications/System
 #Source0:	http://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/%{name}-%{version}.tar.bz2
@@ -48,7 +48,6 @@ 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
@@ -78,13 +77,14 @@ BuildRequires:	zlib-devel
 BuildRequires:	uClibc-static >= 2:0.9.29
 	%else
 		%if %{with dietlibc}
-BuildRequires:	dietlibc-static >= 2:0.32-16
+BuildRequires:	dietlibc-static >= 2:0.32-14
 		%else
 BuildRequires:	glibc-static
 		%endif
 	%endif
 %endif
 Requires:	pam >= %{pam_ver}
+Requires:	libblkid = %{version}-%{release}
 Provides:	fdisk
 Provides:	linux32
 Provides:	sparc32
@@ -628,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
@@ -1418,7 +1417,6 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libmount.a
 
-%if %{with initrd} && %{with dietlibc}
 %files -n fsck
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/fsck