Author: sparky Date: Thu Feb 10 18:32:20 2011 GMT Module: packages Tag: HEAD ---- Log message: - some progress made: initrd version still won't build with either dietlibc or uClibc - info documentation is no more; dropped BR: texinfo - gettextize, libtoolize; BR: autoconf, gtk-doc-automake - locale files changed name to util-linux
---- Files affected: packages/util-linux-ng: util-linux-ng.spec (1.82 -> 1.83) ---- Diffs: ================================================================ Index: packages/util-linux-ng/util-linux-ng.spec diff -u packages/util-linux-ng/util-linux-ng.spec:1.82 packages/util-linux-ng/util-linux-ng.spec:1.83 --- packages/util-linux-ng/util-linux-ng.spec:1.82 Thu Feb 10 12:54:02 2011 +++ packages/util-linux-ng/util-linux-ng.spec Thu Feb 10 19:32:14 2011 @@ -51,9 +51,11 @@ Patch10: util-linux-diet.patch URL: http://userweb.kernel.org/~kzak/util-linux-ng/ BuildRequires: audit-libs-devel >= 1.0.6 +BuildRequires: autoconf BuildRequires: automake >= 1:1.10 BuildRequires: gettext-devel %{?with_fallocate:BuildRequires: glibc-devel >= 6:2.11} +BuildRequires: gtk-doc-automake %{?with_selinux:BuildRequires: libselinux-devel} %{?with_selinux:BuildRequires: libsepol-devel} BuildRequires: libtool @@ -64,7 +66,6 @@ BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.470 BuildRequires: sed >= 4.0 -BuildRequires: texinfo BuildRequires: zlib-devel %if %{with initrd} %if %{with uClibc} @@ -625,6 +626,8 @@ sed -i -e 's/-lncursesw/-lncursesw -ltinfow/' configure.ac %build +%{__gettextize} +%{__libtoolize} %{__aclocal} -I m4 %{__autoconf} %{__autoheader} @@ -635,6 +638,9 @@ %{?with_uClibc:xCC="%{_target_cpu}-uclibc-gcc"} %{?with_dietlibc:xCC="diet %{__cc}"; xCC=${xCC#*ccache }} %configure \ +%if %{with dietlibc} + ac_cv_header_crypt_h="no" \ +%endif CC="$xCC" \ --disable-shared \ --enable-static \ @@ -654,12 +660,13 @@ sed -i -e 's/ cal\$(EXEEXT) / /' misc-utils/Makefile -for dir in shlibs disk-utils misc-utils fsck fdisk schedutils hwclock; do +for dir in shlibs/* disk-utils misc-utils fsck fdisk schedutils hwclock; do %{__make} -C $dir \ %if %{with dietlibc} CPPFLAGS="$CPPFLAGS -D_BSD_SOURCE" \ LDFLAGS="-lcompat" %endif + # empty line required because there is a backslash up there %{__make} -C $dir install DESTDIR=`pwd`/initrd done @@ -684,9 +691,6 @@ %{__make} -cd sys-utils -makeinfo ipc.texi - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security} \ @@ -753,19 +757,11 @@ %endif %endif -%find_lang %{name} - -rm -f $RPM_BUILD_ROOT%{_infodir}/dir +%find_lang util-linux %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/postshell --/usr/sbin/fix-info-dir -c %{_infodir} - -%postun -p /sbin/postshell --/usr/sbin/fix-info-dir -c %{_infodir} - %post -n blockdev /sbin/chkconfig --add blockdev %service blockdev restart @@ -801,7 +797,7 @@ %post -n libmount -p /sbin/ldconfig %postun -n libmount -p /sbin/ldconfig -%files -f %{name}.lang +%files -f util-linux.lang %defattr(644,root,root,755) %doc */README.* text-utils/LICENSE.pg NEWS @@ -1189,8 +1185,6 @@ %attr(755,root,root) /sbin/mkfs.cramfs %attr(755,root,root) /sbin/mkfs.bfs -%{_infodir}/ipc.info* - %ghost /var/lock/wtmpxlock %files -n blockdev @@ -1373,7 +1367,7 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libmount.so %{_libdir}/libmount.la -%{_includedir}/mount +%{_includedir}/libmount %{_pkgconfigdir}/mount.pc %files -n libmount-static @@ -1403,6 +1397,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.83 2011/02/10 18:32:14 sparky +- some progress made: initrd version still won't build with either dietlibc + or uClibc +- info documentation is no more; dropped BR: texinfo +- gettextize, libtoolize; BR: autoconf, gtk-doc-automake +- locale files changed name to util-linux + Revision 1.82 2011/02/10 11:54:02 arekm - up to 2.19; needs crypt detection fix ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-ng.spec?r1=1.82&r2=1.83&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
