X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=e2fsprogs.spec;h=6e71849f46c339ae10b7cfa1182c16dfd293202e;hb=fe802cbd55f79cac5bb3c8cdc7b0ba07a56e5f67;hp=3184c5497e32a8d5b21b32dad935a2ac3d78061f;hpb=55566388b8607da11b17ea33ea4794f5dc49e878;p=packages%2Fe2fsprogs.git

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 3184c54..6e71849 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -1,5 +1,3 @@
-# TODO
-# - run uidd via init.d
 #
 # Conditional build:
 %bcond_with	allstatic	# link everything statically
@@ -36,12 +34,12 @@ Summary(uk.UTF-8):	Утиліти для роботи з файловою сис
 Summary(zh_CN.UTF-8):	管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):	用於管理 ext2 檔案系統的工具程式。
 Name:		e2fsprogs
-Version:	1.40.5
-Release:	0.1
+Version:	1.40.6
+Release:	3
 License:	GPL v2 (with LGPL v2 and BSD parts)
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5:	69e55eaf543acfab8e2eb8ba2883d8cd
+# Source0-md5:	d219b7be4f7170400c646f5611c0b702
 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
@@ -50,27 +48,22 @@ Patch0:		%{name}-info.patch
 Patch1:		e2compr-info.patch
 Patch2:		%{name}-no-bashism.patch
 Patch3:		%{name}-498381.patch
+Patch4:		%{name}-pl.po-update.patch
 URL:		http://e2fsprogs.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	device-mapper-devel >= 1.02.18-2
 BuildRequires:	gettext-devel >= 0.11
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.426
 BuildRequires:	texinfo
-%if %{with static}
+%if %{with allstatic}
 BuildRequires:	device-mapper-static
 BuildRequires:	glibc-static
 BuildRequires:	libselinux-static
 BuildRequires:	libsepol-static
 %endif
-%if %{with initrd}
-	%if %{with uClibc}
-		%ifarch ppc
+%if %{with initrd} && %{with uClibc}
 BuildRequires:	uClibc-static >= 2:0.9.29
-		%else
-BuildRequires:	uClibc-static >= 2:0.9.26
-		%endif
-	%endif
 %endif
 Requires(post,postun):	/sbin/ldconfig
 Requires:	fsck = %{version}-%{release}
@@ -294,6 +287,13 @@ debugfs（用于检查文件系统的内部结构、手动修复被破坏的文
 创建测试范例）、 tune2fs（用于修改文件系统参数）和其它大多数核心
 ext2fs 文件系统实用程序。
 
+%package libs
+Summary:	ext2 filesystem-specific libraries
+Group:		Libraries
+
+%description libs
+ext2 filesystem-specific libraries.
+
 %package devel
 Summary:	ext2 filesystem-specific libraries and headers
 Summary(cs.UTF-8):	Knihovny a hlavičkové soubory pro systém souborů ext2
@@ -318,7 +318,7 @@ Summary(uk.UTF-8):	Бібліотки програміста та хедери 
 Summary(zh_CN.UTF-8):	ext2 文件系统特有的静态库和头文件。
 Summary(zh_TW.UTF-8):	ext2 檔案系統特定的靜態函式庫與表頭。
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	libcom_err-devel = %{version}-%{release}
 Requires:	libuuid-devel = %{version}-%{release}
 Obsoletes:	libext2fs2-devel
@@ -536,7 +536,8 @@ Library for accessing and manipulating UUID - static version.
 Biblioteka umożliwiająca dostęp i zmiany UUID - wersja statyczna.
 
 %package -n uuidd
-Summary:	helper daemon to guarantee uniqueness of time-based UUIDs
+Summary:	Helper daemon to guarantee uniqueness of time-based UUIDs
+Summary(pl.UTF-8):	Pomocniczy demon gwarantujący unikalność UUID-ów opartych na czasie
 License:	GPL v2
 Group:		Daemons
 Requires(postun):	/usr/sbin/groupdel
@@ -557,11 +558,17 @@ The uuidd package contains a userspace daemon (uuidd) which guarantees
 uniqueness of time-based UUID generation even at very high rates on
 SMP systems.
 
+%description -n uuidd -l pl.UTF-8
+Ten pakiet zawiera działającego w przestrzeni użytkownika demona
+(uuidd) gwarantującego unikalność generowania UUID-ów opartych na
+czasie nawet przy bardzo dużej częstotliwości na systemach SMP.
+
 %package -n fsck
 Summary:	Check and repair a Linux file system
 Summary(pl.UTF-8):	Sprawdzenie i naprawa linuksowego systemu plików
 Group:		Applications/System
 Requires:	libuuid = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description -n fsck
 Check and repair a Linux file system.
@@ -585,18 +592,15 @@ etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd.
 %prep
 %setup -q
 %patch0 -p1
-gunzip < %{SOURCE1} > doc/e2compr.texinfo
+%{__gzip} -dc < %{SOURCE1} > doc/e2compr.texinfo
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
-sed -i -e "
-	s,DEVMAPPER_REQ='libselinux libsepol',DEVMAPPER_REQ=,;
-	s,DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol',DEVMAPPER_LIBS='-ldevmapper',;
-	s,/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a,/usr/%{_lib}/libdevmapper.a /usr/%{_lib}/libselinux.a /usr/%{_lib}/libsepol.a," \
-	-e '/AC_SUBST(DO_TEST_SUITE/a\MKINSTALLDIRS="install -d"\nAC_SUBST(MKINSTALLDIRS)\n' configure.in
+%{__rm} debugfs/*.o
 
-%{!?with_static:sed '/^all:/s/e2fsck\.static//' -i e2fsck/Makefile.in}
+sed -i -e '/AC_SUBST(DO_TEST_SUITE/a\MKINSTALLDIRS="install -d"\nAC_SUBST(MKINSTALLDIRS)\n' configure.in
 
 # AX_TLS
 tail -n +2604 aclocal.m4 > acinclude.m4
@@ -630,7 +634,6 @@ mv -f misc/blkid initrd-blkid
 	--enable-blkid-devmapper \
 	--enable-compression \
 	--enable-htree \
-	%{!?with_static:--enable-dynamic-e2fsck} \
 	--enable-fsck \
 	--disable-rpath
 
@@ -692,18 +695,19 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun
-/sbin/ldconfig
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
-%post devel	-p	/sbin/postshell
+%post	devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun devel	-p	/sbin/postshell
+%postun	devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %post	-n libcom_err -p /sbin/ldconfig
@@ -756,14 +760,6 @@ fi
 %attr(755,root,root) %{_bindir}/mk_cmds
 %attr(755,root,root) %{_sbindir}/filefrag
 %attr(755,root,root) %{_sbindir}/mklost+found
-%if %{without allstatic}
-%attr(755,root,root) /%{_lib}/libe2p.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libe2p.so.2
-%attr(755,root,root) /%{_lib}/libext2fs.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libext2fs.so.2
-%attr(755,root,root) /%{_lib}/libss.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libss.so.2
-%endif
 %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
@@ -865,6 +861,18 @@ fi
 %{_datadir}/ss
 %{_infodir}/e2compr.info*
 
+%files libs
+%if %{without allstatic}
+%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.*.*
+%attr(755,root,root) %ghost /%{_lib}/libext2fs.so.2
+%attr(755,root,root) /%{_lib}/libss.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libss.so.2
+%endif
+
 %files devel
 %defattr(644,root,root,755)
 %doc doc/libblkid.txt
@@ -948,10 +956,6 @@ fi
 %files -n fsck
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/fsck
-%if %{without allstatic}
-%attr(755,root,root) /%{_lib}/libblkid.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libblkid.so.1
-%endif
 %{_mandir}/man8/fsck.8*
 %lang(it) %{_mandir}/it/man8/fsck.8*
 %lang(ja) %{_mandir}/ja/man8/fsck.8*