packages: util-linux/util-linux.spec, util-linux/no-openat.patch (NEW) - di...

[glen]

Author: glen                         Date: Sat Jun 25 18:07:29 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable partx/* apps due missing openat for ac

---- Files affected:
packages/util-linux:
   util-linux.spec (1.308 -> 1.309) , no-openat.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/util-linux/util-linux.spec
diff -u packages/util-linux/util-linux.spec:1.308 packages/util-linux/util-linux.spec:1.309
--- packages/util-linux/util-linux.spec:1.308	Sat Jun 25 19:23:58 2011
+++ packages/util-linux/util-linux.spec	Sat Jun 25 20:07:24 2011
@@ -7,9 +7,11 @@
 %if "%{pld_release}" == "ac"
 %bcond_with		initrd		# don't build initrd version
 %bcond_with		fallocate	# fallocate utility (needs glibc 2.11 to compile)
+%bcond_with		partx		# partx utility (needs glibc 2.x to compile)
 %else
 %bcond_without	initrd		# don't build initrd version
 %bcond_without	fallocate	# fallocate utility (needs glibc 2.11 to compile)
+%bcond_without	partx		# partx utility (needs glibc 2.x to compile)
 %endif
 
 %if "%{pld_release}" == "ac"
@@ -50,6 +52,7 @@
 Patch8:		%{name}-procpartitions.patch
 Patch9:		%{name}-swaponsymlink.patch
 Patch10:	%{name}-diet.patch
+Patch11:	no-openat.patch
 URL:		http://userweb.kernel.org/~kzak/util-linux/
 BuildRequires:	audit-libs-devel >= 1.0.6
 BuildRequires:	autoconf >= 2.60
@@ -623,8 +626,13 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%if %{without partx}
+%patch11 -p1
+%endif
 
+%if "%{pld_release}" != "ac"
 sed -i -e 's/-lncursesw/-lncursesw -ltinfow/' configure.ac
+%endif
 
 %{__rm} po/stamp-po
 
@@ -708,7 +716,9 @@
 
 sed -i -e 's,/usr/spool/mail,/var/mail,g' $RPM_BUILD_ROOT%{_mandir}/man1/login.1
 
+%if %{with partx}
 mv $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
+%endif
 
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
@@ -855,16 +865,18 @@
 
 %attr(755,root,root) /bin/dmesg
 %attr(755,root,root) /bin/kill
-%attr(755,root,root) /bin/lsblk
 %attr(755,root,root) /bin/more
-%attr(755,root,root) /sbin/addpart
 %attr(755,root,root) /sbin/ctrlaltdel
+%if %{with partx}
+%attr(755,root,root) /sbin/addpart
 %attr(755,root,root) /sbin/delpart
+%attr(755,root,root) /sbin/partx
+%attr(755,root,root) /bin/lsblk
+%endif
 %attr(755,root,root) /sbin/fsfreeze
 %attr(755,root,root) /sbin/fstrim
 %attr(755,root,root) /sbin/mkfs
 %attr(755,root,root) /sbin/mkswap
-%attr(755,root,root) /sbin/partx
 %attr(755,root,root) /sbin/swaplabel
 %if "%{pld_release}" != "ac"
 %attr(755,root,root) /sbin/switch_root
@@ -951,18 +963,20 @@
 %{_mandir}/man1/unshare.1*
 %{_mandir}/man1/whereis.1*
 %{_mandir}/man1/write.1*
+%if %{with partx}
 %{_mandir}/man8/addpart.8*
+%{_mandir}/man8/delpart.8*
+%{_mandir}/man8/partx.8*
+%{_mandir}/man8/lsblk.8*
+%endif
 %{_mandir}/man8/ctrlaltdel.8*
 %{_mandir}/man8/cytune.8*
-%{_mandir}/man8/delpart.8*
 %{_mandir}/man8/fdformat.8*
 %{_mandir}/man8/fsfreeze.8*
 %{_mandir}/man8/fstrim.8*
 %{_mandir}/man8/isosize.8*
 %{_mandir}/man8/ldattach.8*
-%{_mandir}/man8/lsblk.8*
 %{_mandir}/man8/mkswap.8*
-%{_mandir}/man8/partx.8*
 %{_mandir}/man8/rtcwake.8*
 %{_mandir}/man8/swaplabel.8*
 %if "%{pld_release}" != "ac"
@@ -1409,6 +1423,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.309  2011/06/25 18:07:24  glen
+- disable partx/* apps due missing openat for ac
+
 Revision 1.308  2011/06/25 17:23:58  glen
 - libtool 2 in m4/
 

================================================================
Index: packages/util-linux/no-openat.patch
diff -u /dev/null packages/util-linux/no-openat.patch:1.1
--- /dev/null	Sat Jun 25 20:07:29 2011
+++ packages/util-linux/no-openat.patch	Sat Jun 25 20:07:24 2011
@@ -0,0 +1,12 @@
+--- util-linux-2.19.1/Makefile.am	2011-06-25 20:30:22.848372212 +0300
++++ util-linux-2.19.1/Makefile.am	2011-06-25 20:33:07.240163948 +0300
+@@ -38,8 +38,7 @@
+ 
+ if LINUX
+ SUBDIRS += \
+-	hwclock \
+-	partx
++	hwclock
+ endif
+ 
+ if BUILD_INIT
================================================================

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