SPECS: coreutils.spec - merged update to 6.6 from DEVEL

[qboosh]

Author: qboosh                       Date: Fri Dec  8 14:15:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged update to 6.6 from DEVEL

---- Files affected:
SPECS:
   coreutils.spec (1.112 -> 1.113) 

---- Diffs:

================================================================
Index: SPECS/coreutils.spec
diff -u SPECS/coreutils.spec:1.112 SPECS/coreutils.spec:1.113
--- SPECS/coreutils.spec:1.112	Thu Nov  2 16:33:04 2006
+++ SPECS/coreutils.spec	Fri Dec  8 15:15:06 2006
@@ -6,15 +6,12 @@
 Summary:	GNU Core-utils - basic command line utilities
 Summary(pl):	GNU Core-utils - podstawowe narzędzia działające z linii poleceń
 Name:		coreutils
-Version:	5.2.1
-Release:	9
+Version:	6.6
+Release:	0.1
 License:	GPL
 Group:		Applications/System
-# devel versions:
-#Source0:	ftp://alpha.gnu.org/gnu/fetish/%{name}-%{version}.tar.bz2
-# final versions:
 Source0:	ftp://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.bz2
-# Source0-md5:	172ee3c315af93d3385ddfbeb843c53f
+# Source0-md5:	64f1589af7d9a879c9bdc0af41e19ff1
 Source1:	%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	f7c986ebc74ccb8d08ed70141063f14c
 Source2:	DIR_COLORS
@@ -22,7 +19,7 @@
 Source4:	fileutils.csh
 Source5:	su.pamd
 Patch0:		%{name}-info.patch
-Patch1:		%{name}-pl.po-update.patch
+#Patch1 reserved for %{name}-pl.po-update.patch
 Patch2:		%{name}-pam.patch
 Patch3:		%{name}-getgid.patch
 Patch4:		%{name}-su-paths.patch
@@ -32,17 +29,13 @@
 Patch8:		%{name}-install-C.patch
 Patch9:		%{name}-po.patch
 Patch10:	%{name}-no-nb.patch
-# based on patch from Fedora, based on patches from http://acl.bestbits.at/
-Patch11:	%{name}-acl.patch
-Patch12:	%{name}-selinux.patch
-Patch13:	%{name}-gettext-m4.patch
-Patch14:	%{name}-euidaccess.patch
+Patch11:	%{name}-selinux.patch
 URL:		http://www.gnu.org/software/coreutils/
 BuildRequires:	acl-devel
-BuildRequires:	autoconf >= 2.58
-BuildRequires:	automake >= 1:1.8
+BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake >= 1:1.9.6
 %{?with_selinux:BuildRequires:	gcc >= 5:3.2}
-BuildRequires:	gettext-devel >= 0.11.5
+BuildRequires:	gettext-devel >= 0.16-2
 BuildRequires:	help2man
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	pam-devel
@@ -100,7 +93,6 @@
 %prep
 %setup -q -a1
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -110,13 +102,9 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
-%{?with_selinux:%patch12 -p1}
-%patch13 -p1
-%patch14 -p1
+%{?with_selinux:%patch11 -p1}
 
 %{__perl} -pi -e 's at GNU/Linux at PLD Linux@' m4/host-os.m4
-%{__perl} -pi -e 's/tee \(/tee_files (/' src/tee.c
 
 # no_NO is just an alias for nb_NO in recent glibc
 # no.po is outdated, nb.po is more fresh here (see also patch10)
@@ -124,9 +112,10 @@
 # allow rebuilding *.gmo
 rm -f po/stamp-po
 
+# missing, added to gettext.m4 by ./bootstrap
+echo 'AC_DEFUN([gl_LOCK_EARLY],[])' > m4/gllock.m4
+
 %build
-# jm's inttypes.m4 and inttypes.m4 from gettext are really different files
-mv -f m4/{inttypes.m4,jm-inttypes.m4}
 %{__gettextize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -217,6 +206,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.113  2006/12/08 14:15:06  qboosh
+- merged update to 6.6 from DEVEL
+
 Revision 1.112  2006/11/02 15:33:04  sparky
 - reverted, wrong branch
 
@@ -225,6 +217,35 @@
 
 Revision 1.110  2006/11/01 00:16:05  sparky
 - fix build with glibc 2.5 (tee() declared in fnctl.h)
+
+Revision 1.109.2.9  2006/11/26 22:51:07  qboosh
+- up to 6.6, pl.po-update patch currently obsolete
+
+Revision 1.109.2.8  2006/11/24 17:42:26  qboosh
+- cleanup, removed obsolete gettext-m4,euidaccess patches
+
+Revision 1.109.2.7  2006/11/22 13:25:28  qboosh
+- updated po patch is back
+
+Revision 1.109.2.6  2006/11/22 09:59:10  qboosh
+- up to 6.5
+- updated pl.po-update,getgid,selinux patches
+
+Revision 1.109.2.5  2006/11/02 15:33:41  sparky
+- BR: gettext-devel >= 0.16-2
+
+Revision 1.109.2.4  2006/10/31 23:54:54  sparky
+- selinux patch updated, testers needed
+
+Revision 1.109.2.3  2006/10/31 21:10:15  sparky
+- po patch not needed anymore, acl support already in source
+
+Revision 1.109.2.2  2006/10/24 20:31:48  qboosh
+- up to 6.4, updated install-C patch
+
+Revision 1.109.2.1  2006/10/18 18:41:44  qboosh
+- started update to 6.3, WIP, still needs some work to make it build
+- updated info,pam,getgid,install-C patches
 
 Revision 1.109  2006/08/23 08:05:21  havner
 - no 755 in /etc/shrc.d
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/coreutils.spec?r1=1.112&r2=1.113&f=u