Author: baggins Date: Wed Mar 18 15:23:28 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2 - added libuuid-dietlibc (for cryptsetup-initrd)
---- Files affected: SPECS: e2fsprogs.spec (1.202 -> 1.203) ---- Diffs: ================================================================ Index: SPECS/e2fsprogs.spec diff -u SPECS/e2fsprogs.spec:1.202 SPECS/e2fsprogs.spec:1.203 --- SPECS/e2fsprogs.spec:1.202 Wed Mar 18 00:21:49 2009 +++ SPECS/e2fsprogs.spec Wed Mar 18 16:23:22 2009 @@ -37,7 +37,7 @@ Summary(zh_TW.UTF-8): 用於管理 ext2 檔案系統的工具程式。 Name: e2fsprogs Version: 1.41.4 -Release: 1 +Release: 2 License: GPL v2 (with LGPL v2 and BSD parts) Group: Applications/System Source0: http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz @@ -83,6 +83,10 @@ # changing CFLAGS in the middle confuses confcache %undefine configure_cache +# for some reason known only to rpm there must be "\\|" not "\|" here +%define dietarch %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/') +%define dietlibdir %{_prefix}/lib/dietlibc/lib-%{dietarch} + %description The e2fsprogs package contains a number of utilities for creating, checking, modifying and correcting any inconsistencies in second @@ -550,6 +554,20 @@ %description -n libuuid-static -l pl.UTF-8 Biblioteka umożliwiająca dostęp i zmiany UUID - wersja statyczna. +%package -n libuuid-dietlibc +Summary: Static dietlibc library for accessing and manipulating UUID +Summary(pl.UTF-8): Statyczna biblioteka dietlibc umożliwiająca dostęp i zmiany UUID +License: BSD +Group: Development/Libraries +Requires: libuuid-devel = %{version}-%{release} +Conflicts: e2fsprogs-static < 1.34-3 + +%description -n libuuid-dietlibc +Library for accessing and manipulating UUID - static dietlibc version. + +%description -n libuuid-dietlibc -l pl.UTF-8 +Biblioteka umożliwiająca dostęp i zmiany UUID - wersja statyczna dietlibc. + %package -n uuidd Summary: Helper daemon to guarantee uniqueness of time-based UUIDs Summary(pl.UTF-8): Pomocniczy demon gwarantujący unikalność UUID-ów opartych na czasie @@ -652,11 +670,12 @@ mv -f misc/blkid initrd-blkid mv -f misc/mke2fs initrd-mke2fs mv -f misc/fsck initrd-e2fsck -%{__make} clean %if %{with dietlibc} sed -i -e 's|\(^LIBUUID = .*\) -lcompat|\1|g' \ -e 's|\(^STATIC_LIBUUID = .*\) -lcompat|\1|g' MCONFIG.in +mv -f lib/uuid/libuuid.a diet-libuuid.a %endif +%{__make} clean %endif %configure \ @@ -678,6 +697,7 @@ %install rm -rf $RPM_BUILD_ROOT +%{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}} export PATH=/sbin:$PATH install -d $RPM_BUILD_ROOT/var/lib/libuuid @@ -749,6 +769,8 @@ install initrd-mke2fs $RPM_BUILD_ROOT/sbin/initrd-mke2fs %endif +%{?with_dietlibc:install diet-libuuid.a $RPM_BUILD_ROOT%{dietlibdir}/libuuid.a} + %clean rm -rf $RPM_BUILD_ROOT @@ -1033,6 +1055,12 @@ %defattr(644,root,root,755) %{_libdir}/libuuid.a +%if %{with dietlibc} +%files -n libuuid-dietlibc +%defattr(644,root,root,755) +%{dietlibdir}/libuuid.a +%endif + %files -n uuidd %defattr(644,root,root,755) %attr(6755,uuidd,uuidd) %{_sbindir}/uuidd @@ -1060,6 +1088,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.203 2009/03/18 15:23:22 baggins +- rel 2 +- added libuuid-dietlibc (for cryptsetup-initrd) + Revision 1.202 2009/03/17 23:21:49 baggins - 1.41.4 - added dietlibc build and bcond ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e2fsprogs.spec?r1=1.202&r2=1.203&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
