- BR util-linux-ng-devel (libblkid)

[packages/e2fsprogs.git] / e2fsprogs.spec

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index e3a0dc4ce6eee8b59e5ab26749f3cc444aa40658..2e6b58b76463892bb21c9fe7b2c17521016e731f 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -35,12 +35,12 @@ Summary(uk.UTF-8):  Утиліти для роботи з файловою сис
 Summary(zh_CN.UTF-8):  管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):  用於管理 ext2 檔案系統的工具程式。
 Name:          e2fsprogs
-Version:       1.41.4
-Release:       2
+Version:       1.41.5
+Release:       0.1
 License:       GPL v2 (with LGPL v2 and BSD parts)
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5: 59033388df36987d2b9c9bbf7e19bd57
+# Source0-md5: e218df6c84fc17c1126d31de9472a76c
 Source1:       e2compr-0.4.texinfo.gz
 # Source1-md5: c3c59ff37e49d8759abb1ef95a8d3abf
 Source2:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -55,6 +55,7 @@ BuildRequires:        automake
 BuildRequires: gettext-devel >= 0.11
 BuildRequires: rpmbuild(macros) >= 1.426
 BuildRequires: texinfo
+BuildRequires: util-linux-ng-devel >= 2.15-3
 %if %{with allstatic}
 BuildRequires: glibc-static
 BuildRequires: libselinux-static
@@ -611,18 +612,18 @@ Check and repair a Linux file system.
 Sprawdzenie i naprawa linuksowego systemu plików.
 
 %package initrd
-Summary:       blkid - initrd version
-Summary(pl.UTF-8):     blkid - wersja dla initrd
+Summary:       e2fsck and mke2fs - initrd version
+Summary(pl.UTF-8):     e2fsck i mke2fs - wersja dla initrd
 Group:         Base
-Conflicts:     geninitrd <= 10000.3
+Conflicts:     geninitrd < 10000.10
 
 %description initrd
-This package includes a blkid utility to recognize partitions by label
-or UUID - staticaly linked for initrd.
+This package includes a e2fsck and mke2fs utilities staticaly
+linked for initrd.
 
 %description initrd -l pl.UTF-8
-Pakiet ten zawiera narzędzie blkid do rozpoznawania partycji przez
-etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd.
+Pakiet ten zawiera narzędziae2fsck i mke2fs statycznie skonsolidowane
+na potrzeby initrd.
 
 %prep
 %setup -q
@@ -656,6 +657,7 @@ sed -i -e 's|\(^LIBUUID = .*\)|\1 -lcompat|g' \
        --with-ccopts="%{rpmcflags} -Os" \
        --with-ldopts="%{rpmldflags} -static" \
        --disable-elf-shlibs \
+       --disable-libblkid \
        --disable-selinux \
        --disable-nls \
        --disable-testio-debug \
@@ -667,7 +669,6 @@ sed -i -e 's|\(^LIBUUID = .*\)|\1 -lcompat|g' \
 
 %{__make} -j1 libs
 %{__make} progs
-mv -f misc/blkid initrd-blkid
 mv -f misc/mke2fs initrd-mke2fs
 mv -f misc/fsck initrd-e2fsck
 %if %{with dietlibc}
@@ -682,6 +683,7 @@ mv -f lib/uuid/libuuid.a diet-libuuid.a
        --with-root-prefix="" \
        %{!?with_nls:--disable-nls} \
        %{!?with_allstatic:--enable-elf-shlibs} \
+       --disable-libblkid \
        --enable-compression \
        --enable-htree \
        --enable-fsck \
@@ -761,11 +763,9 @@ echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext4dev.8
 %endif
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/README.e2fsprogs-non-english-man-pages
-touch $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab
 
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_libdir}/initrd
-install initrd-blkid $RPM_BUILD_ROOT%{_libdir}/initrd/blkid
 install initrd-e2fsck $RPM_BUILD_ROOT%{_libdir}/initrd/e2fsck
 install initrd-mke2fs $RPM_BUILD_ROOT%{_libdir}/initrd/mke2fs
 %endif
@@ -820,7 +820,6 @@ fi
 # COPYING specifies license details for some parts of package
 %doc COPYING README RELEASE-NOTES
 %attr(755,root,root) /sbin/badblocks
-%attr(755,root,root) /sbin/blkid
 %attr(755,root,root) /sbin/debugfs
 %attr(755,root,root) /sbin/dumpe2fs
 %attr(755,root,root) /sbin/e2fsck
@@ -848,14 +847,12 @@ fi
 %attr(755,root,root) %{_libdir}/e2initrd_helper
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/e2fsck.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mke2fs.conf
-%ghost %{_sysconfdir}/blkid.tab
 %{_mandir}/man1/chattr.1*
 %{_mandir}/man1/lsattr.1*
 %{_mandir}/man1/mk_cmds.1*
 %{_mandir}/man5/e2fsck.conf.5*
 %{_mandir}/man5/mke2fs.conf.5*
 %{_mandir}/man8/badblocks.8*
-%{_mandir}/man8/blkid.8*
 %{_mandir}/man8/debugfs.8*
 %{_mandir}/man8/dumpe2fs.8*
 %{_mandir}/man8/e2fsck.8*
@@ -972,8 +969,6 @@ fi
 %if %{without allstatic}
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libblkid.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libblkid.so.1
 %attr(755,root,root) /%{_lib}/libe2p.so.*.*
 %attr(755,root,root) %ghost /%{_lib}/libe2p.so.2
 %attr(755,root,root) /%{_lib}/libext2fs.so.*.*
@@ -984,27 +979,21 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/libblkid.txt
 %if %{without allstatic}
-%attr(755,root,root) %{_libdir}/libblkid.so
 %attr(755,root,root) %{_libdir}/libe2p.so
 %attr(755,root,root) %{_libdir}/libext2fs.so
 %attr(755,root,root) %{_libdir}/libss.so
 %endif
-%{_includedir}/blkid
 %{_includedir}/e2p
 %{_includedir}/ext2fs
 %{_includedir}/ss
-%{_pkgconfigdir}/blkid.pc
 %{_pkgconfigdir}/e2p.pc
 %{_pkgconfigdir}/ext2fs.pc
 %{_pkgconfigdir}/ss.pc
 %{_infodir}/libext2fs.info*
-%{_mandir}/man3/libblkid.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libblkid.a
 %{_libdir}/libe2p.a
 %{_libdir}/libext2fs.a
 %{_libdir}/libss.a
@@ -1080,7 +1069,6 @@ fi
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/initrd/blkid
 %attr(755,root,root) %{_libdir}/initrd/e2fsck
 %attr(755,root,root) %{_libdir}/initrd/mke2fs
 %endif