SPECS: util-linux-ng.spec - up to 2.14 (push dm-crypt upstream instead of p...

[arekm]

Author: arekm                        Date: Fri Aug  8 06:39:07 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 2.14 (push dm-crypt upstream instead of putting it here IMO)

---- Files affected:
SPECS:
   util-linux-ng.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/util-linux-ng.spec
diff -u SPECS/util-linux-ng.spec:1.22 SPECS/util-linux-ng.spec:1.23
--- SPECS/util-linux-ng.spec:1.22	Tue Apr 22 09:42:12 2008
+++ SPECS/util-linux-ng.spec	Fri Aug  8 08:39:01 2008
@@ -14,12 +14,12 @@
 Summary(tr.UTF-8):	Temel sistem araçları
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux-ng
-Version:	2.13.1.1
+Version:	2.14
 Release:	1
 License:	GPL
 Group:		Applications/System
-Source0:	ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/%{name}-%{version}.tar.bz2
-# Source0-md5:	806259f4cf3e540e90e9db98105d080f
+Source0:	ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	23f227da49df36f33fe47e917e332cd8
 # Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 Source1:	util-linux-non-english-man-pages.tar.bz2
 # Source1-md5:	81bbcc9a820512ecde87a8f31de0b745
@@ -27,7 +27,7 @@
 Source3:	util-linux-blockdev.init
 Source4:	util-linux-blockdev.sysconfig
 Patch0:		%{name}-ppc.patch
-Patch1:		%{name}-dm_crypt.patch
+Patch1:		%{name}-ncurses.patch
 URL:		http://userweb.kernel.org/~kzak/util-linux-ng/
 BuildRequires:	audit-libs-devel >= 1.0.6
 BuildRequires:	autoconf
@@ -342,7 +342,7 @@
 %prep
 %setup -q -a1
 %patch0 -p1
-%patch1 -p1
+%patch1 -p0
 
 %build
 %{__libtoolize}
@@ -351,7 +351,7 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-CPPFLAGS="-I/usr/include/ncurses"; export CPPFLAGS
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"; export CPPFLAGS
 %configure \
 	--bindir=/bin \
 	--sbindir=/sbin \
@@ -490,7 +490,6 @@
 %attr(755,root,root) %{_bindir}/colrm
 %attr(755,root,root) %{_bindir}/column
 %attr(755,root,root) %{_bindir}/ddate
-%attr(755,root,root) %{_bindir}/fdformat
 %attr(755,root,root) %{_bindir}/flock
 %attr(755,root,root) %{_bindir}/getopt
 %attr(755,root,root) %{_bindir}/hexdump
@@ -508,6 +507,7 @@
 %attr(755,root,root) %{_bindir}/renice
 %attr(755,root,root) %{_bindir}/rev
 %attr(755,root,root) %{_bindir}/script
+%attr(755,root,root) %{_bindir}/scriptreplay
 %attr(755,root,root) %{_bindir}/setarch
 %attr(755,root,root) %{_bindir}/linux*
 %{_mandir}/man8/linux*
@@ -546,6 +546,8 @@
 %{!?with_uClibc:%attr(755,root,root) %{_bindir}/ul}
 %attr(755,root,root) %{_bindir}/whereis
 %attr(2755,root,tty) %{_bindir}/write
+%attr(755,root,root) %{_sbindir}/fdformat
+%attr(755,root,root) %{_sbindir}/ldattach
 %attr(755,root,root) %{_sbindir}/readprofile
 %attr(755,root,root) %{_sbindir}/rtcwake
 
@@ -577,6 +579,7 @@
 %{_mandir}/man1/rename.1*
 %{_mandir}/man1/setsid.1*
 %{_mandir}/man1/script.1*
+%{_mandir}/man1/scriptreplay.1*
 %{!?with_uClibc:%{_mandir}/man1/setterm.1*}
 %{_mandir}/man1/tailf.1*
 %{_mandir}/man1/taskset.1*
@@ -590,6 +593,7 @@
 %{_mandir}/man8/delpart.8*
 %{_mandir}/man8/fdformat.8*
 %{_mandir}/man8/isosize.8*
+%{_mandir}/man8/ldattach.8*
 %{_mandir}/man8/mkswap.8*
 %{_mandir}/man8/partx.8*
 %{_mandir}/man8/rtcwake.8*
@@ -1020,7 +1024,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.22  2008/04/22 07:42:12  arekm
+Revision 1.23  2008/08/08 06:39:01  arekm
+- up to 2.14 (push dm-crypt upstream instead of putting it here IMO)
+
+Revision 1.22  2008-04-22 07:42:12  arekm
 - up to 2.13.1.1; audit log injection attack via login fix (CVE-2007-3102)
 
 Revision 1.21  2008-03-27 04:30:10  sls
================================================================

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