packages: e2fsprogs/e2fsprogs.spec - 1.41.5 - disable and remove libblkid, ...

[baggins]

Author: baggins                      Date: Tue May 19 14:29:41 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.41.5
- disable and remove libblkid, it's now part of util-linux-ng

---- Files affected:
packages/e2fsprogs:
   e2fsprogs.spec (1.208 -> 1.209) 

---- Diffs:

================================================================
Index: packages/e2fsprogs/e2fsprogs.spec
diff -u packages/e2fsprogs/e2fsprogs.spec:1.208 packages/e2fsprogs/e2fsprogs.spec:1.209
--- packages/e2fsprogs/e2fsprogs.spec:1.208	Mon May 18 16:57:17 2009
+++ packages/e2fsprogs/e2fsprogs.spec	Tue May 19 16:29:35 2009
@@ -36,12 +36,12 @@
 Summary(zh_CN.UTF-8):	管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):	用於管理 ext2 檔案系統的工具程式。
 Name:		e2fsprogs
-Version:	1.41.4
-Release:	3
+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
@@ -657,6 +657,7 @@
 	--with-ccopts="%{rpmcflags} -Os" \
 	--with-ldopts="%{rpmldflags} -static" \
 	--disable-elf-shlibs \
+	--disable-libblkid \
 	--disable-selinux \
 	--disable-nls \
 	--disable-testio-debug \
@@ -682,6 +683,7 @@
 	--with-root-prefix="" \
 	%{!?with_nls:--disable-nls} \
 	%{!?with_allstatic:--enable-elf-shlibs} \
+	--disable-libblkid \
 	--enable-compression \
 	--enable-htree \
 	--enable-fsck \
@@ -761,7 +763,6 @@
 %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
@@ -819,7 +820,6 @@
 # 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
@@ -847,14 +847,12 @@
 %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*
@@ -971,8 +969,6 @@
 %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.*.*
@@ -983,27 +979,21 @@
 
 %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
@@ -1089,6 +1079,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.209  2009/05/19 14:29:35  baggins
+- 1.41.5
+- disable and remove libblkid, it's now part of util-linux-ng
+
 Revision 1.208  2009/05/18 14:57:17  baggins
 - blkid went to util-linux-ng, so remove it from initrd package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/e2fsprogs/e2fsprogs.spec?r1=1.208&r2=1.209&f=u