Author: arekm Date: Sun Jul 19 12:00:20 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 5; fsck moved to util-linux-ng
---- Files affected: packages/e2fsprogs: e2fsprogs.spec (1.223 -> 1.224) ---- Diffs: ================================================================ Index: packages/e2fsprogs/e2fsprogs.spec diff -u packages/e2fsprogs/e2fsprogs.spec:1.223 packages/e2fsprogs/e2fsprogs.spec:1.224 --- packages/e2fsprogs/e2fsprogs.spec:1.223 Sun Jul 19 09:35:07 2009 +++ packages/e2fsprogs/e2fsprogs.spec Sun Jul 19 14:00:13 2009 @@ -37,7 +37,7 @@ Summary(zh_TW.UTF-8): 用於管理 ext2 檔案系統的工具程式。 Name: e2fsprogs Version: 1.41.8 -Release: 4 +Release: 5 License: GPL v2 (with LGPL v2 and BSD parts) Group: Applications/System Source0: http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz @@ -78,7 +78,7 @@ %endif %endif Requires(post,postun): /sbin/ldconfig -Requires: fsck = %{version}-%{release} +Requires: fsck Requires: libcom_err = %{version}-%{release} Obsoletes: e2fsprogs-evms Obsoletes: libext2fs2 @@ -521,20 +521,6 @@ %description -n libcom_err-static -l pl.UTF-8 Biblioteka opisu popularnych błędów dla uniksów - wersja statyczna. -%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 -%if %{without allstatic} -Requires: %{name}-libs = %{version}-%{release} -%endif - -%description -n fsck -Check and repair a Linux file system. - -%description -n fsck -l pl.UTF-8 -Sprawdzenie i naprawa linuksowego systemu plików. - %package initrd Summary: e2fsck and mke2fs - initrd version Summary(pl.UTF-8): e2fsck i mke2fs - wersja dla initrd @@ -584,6 +570,7 @@ --with-ccopts="%{rpmcflags} -Os" \ --with-ldopts="%{rpmldflags} -static" \ --disable-elf-shlibs \ + --disable-fsck \ --disable-libblkid \ --disable-libuuid \ --disable-nls \ @@ -597,7 +584,6 @@ %{__make} -j1 libs %{__make} progs mv -f misc/mke2fs initrd-mke2fs -mv -f misc/fsck initrd-e2fsck %{__make} clean %{?with_dietlibc:mv MCONFIG.in.org MCONFIG.in} %endif @@ -606,12 +592,12 @@ --with-root-prefix="" \ %{!?with_nls:--disable-nls} \ %{!?with_allstatic:--enable-elf-shlibs} \ + --disable-fsck \ --disable-libblkid \ --disable-libuuid \ --disable-uuidd \ --enable-compression \ --enable-htree \ - --enable-fsck \ --disable-rpath %{__make} -j1 libs \ @@ -689,7 +675,6 @@ %if %{with initrd} install -d $RPM_BUILD_ROOT%{_libdir}/initrd -install initrd-e2fsck $RPM_BUILD_ROOT%{_libdir}/initrd/e2fsck install initrd-mke2fs $RPM_BUILD_ROOT%{_libdir}/initrd/mke2fs %endif @@ -714,9 +699,6 @@ %post -n libcom_err -p /sbin/ldconfig %postun -n libcom_err -p /sbin/ldconfig -%post -n fsck -p /sbin/ldconfig -%postun -n fsck -p /sbin/ldconfig - %files %{?with_nls:-f %{name}.lang} %defattr(644,root,root,755) # COPYING specifies license details for some parts of package @@ -920,19 +902,9 @@ %defattr(644,root,root,755) %{_libdir}/libcom_err.a -%files -n fsck -%defattr(644,root,root,755) -%attr(755,root,root) /sbin/fsck -%{_mandir}/man8/fsck.8* -%lang(it) %{_mandir}/it/man8/fsck.8* -%lang(ja) %{_mandir}/ja/man8/fsck.8* -%lang(ko) %{_mandir}/ko/man8/fsck.8* -%lang(pl) %{_mandir}/pl/man8/fsck.8* - %if %{with initrd} %files initrd %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/initrd/e2fsck %attr(755,root,root) %{_libdir}/initrd/mke2fs %endif @@ -942,6 +914,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.224 2009/07/19 12:00:13 arekm +- rel 5; fsck moved to util-linux-ng + Revision 1.223 2009/07/19 07:35:07 arekm - rel 4; filterout relro on ppc - otherwise every compiled program is killed immediately ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/e2fsprogs/e2fsprogs.spec?r1=1.223&r2=1.224&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
