packages: util-linux-ng/util-linux-ng.spec - no need to regenerate auto* (n...

[glen]

Author: glen                         Date: Sat May  8 21:57:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- no need to regenerate auto* (no relevant file patched)
- needs newer llh (tested with 2.6.27) for ionice related syscalls
- disable switch_root on ac
- fix without initrd packaging

---- Files affected:
packages/util-linux-ng:
   util-linux-ng.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: packages/util-linux-ng/util-linux-ng.spec
diff -u packages/util-linux-ng/util-linux-ng.spec:1.66 packages/util-linux-ng/util-linux-ng.spec:1.67
--- packages/util-linux-ng/util-linux-ng.spec:1.66	Fri May  7 08:50:37 2010
+++ packages/util-linux-ng/util-linux-ng.spec	Sat May  8 23:57:04 2010
@@ -43,14 +43,12 @@
 Patch2:		%{name}-union-mount.patch
 URL:		http://userweb.kernel.org/~kzak/util-linux-ng/
 BuildRequires:	audit-libs-devel >= 1.0.6
-BuildRequires:	autoconf
-BuildRequires:	automake
 BuildRequires:	gettext-devel
 %{?with_fallocate:BuildRequires:	glibc-devel >= 6:2.11}
-BuildRequires:	intltool
 %{?with_selinux:BuildRequires:	libselinux-devel}
 %{?with_selinux:BuildRequires:	libsepol-devel}
 BuildRequires:	libtool
+BuildRequires:	linux-libc-headers >= 7:2.6.27
 BuildRequires:	ncurses-devel >= 5.0
 BuildRequires:	pam-devel >= %{pam_ver}
 BuildRequires:	pkgconfig
@@ -547,13 +545,7 @@
 %patch2 -p1
 
 %build
-%{__libtoolize}
-%{__gettextize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE -DHAVE_LLSEEK_PROTOTYPE"; export CPPFLAGS
+export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE -DHAVE_LLSEEK_PROTOTYPE"
 %if %{with initrd}
 %{?with_uClibc:xCC="%{_target_cpu}-uclibc-gcc"}
 %{?with_dietlibc:xCC="diet %{__cc}"; xCC=${xCC#*ccache }}
@@ -636,9 +628,9 @@
 
 mv $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
 
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev
+cp -a  %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev
 
 :> $RPM_BUILD_ROOT/etc/security/blacklist.login
 :> $RPM_BUILD_ROOT/var/lock/wtmpxlock
@@ -657,7 +649,7 @@
 	for m in man1 man5 man8 ; do
 		if [ -d man/$d/$m ]; then
 			install -d $RPM_BUILD_ROOT%{_mandir}/$d/$m
-			install man/$d/$m/* $RPM_BUILD_ROOT%{_mandir}/$d/$m
+			cp -a man/$d/$m/* $RPM_BUILD_ROOT%{_mandir}/$d/$m
 		fi
 	done
 done
@@ -680,19 +672,21 @@
 
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_libdir}/initrd
-install blkid.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/blkid
-install findfs.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/findfs
-install fsck.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/fsck
+install -p blkid.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/blkid
+install -p findfs.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/findfs
+install -p fsck.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/fsck
 ln -s fsck $RPM_BUILD_ROOT%{_libdir}/initrd/e2fsck
-%endif
 
 %if %{with dietlibc}
-install diet-libblkid.a $RPM_BUILD_ROOT%{dietlibdir}/libblkid.a
-install diet-libuuid.a $RPM_BUILD_ROOT%{dietlibdir}/libuuid.a
+cp -a diet-libblkid.a $RPM_BUILD_ROOT%{dietlibdir}/libblkid.a
+cp -a diet-libuuid.a $RPM_BUILD_ROOT%{dietlibdir}/libuuid.a
+%endif
 %endif
 
 %find_lang %{name}
 
+rm $RPM_BUILD_ROOT%{_infodir}/dir
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -765,7 +759,9 @@
 %attr(755,root,root) /sbin/mkfs
 %attr(755,root,root) /sbin/mkswap
 %attr(755,root,root) /sbin/partx
+%if "%{pld_release}" != "ac"
 %attr(755,root,root) /sbin/switch_root
+%endif
 %attr(755,root,root) /sbin/wipefs
 %attr(755,root,root) %{_bindir}/cal
 %attr(755,root,root) %{_bindir}/chrt
@@ -889,10 +885,11 @@
 %{_mandir}/man8/partx.8*
 %{_mandir}/man8/rtcwake.8*
 %{_mandir}/man8/setarch.8*
+%if "%{pld_release}" != "ac"
 %{_mandir}/man8/switch_root.8*
+%endif
 %{_mandir}/man8/wipefs.8*
 
-
 %lang(de) %{_mandir}/de/man1/kill.1*
 %lang(de) %{_mandir}/de/man1/more.1*
 %lang(de) %{_mandir}/de/man1/write.1*
@@ -1314,7 +1311,7 @@
 %defattr(644,root,root,755)
 %{_libdir}/libblkid.a
 
-%if %{with dietlibc}
+%if %{with initrd} && %{with dietlibc}
 %files -n libblkid-dietlibc
 %defattr(644,root,root,755)
 %{dietlibdir}/libblkid.a
@@ -1339,7 +1336,7 @@
 %defattr(644,root,root,755)
 %{_libdir}/libuuid.a
 
-%if %{with dietlibc}
+%if %{with initrd} && %{with dietlibc}
 %files -n libuuid-dietlibc
 %defattr(644,root,root,755)
 %{dietlibdir}/libuuid.a
@@ -1371,6 +1368,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2010/05/08 21:57:04  glen
+- no need to regenerate auto* (no relevant file patched)
+- needs newer llh (tested with 2.6.27) for ionice related syscalls
+- disable switch_root on ac
+- fix without initrd packaging
+
 Revision 1.66  2010/05/07 06:50:37  glen
 - run diet without ccache
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-ng.spec?r1=1.66&r2=1.67&f=u