rpms/coreutils/devel coreutils-6.10-configuration.patch, 1.7, 1.8 coreutils-DIR_COLORS, 1.3, 1.4 coreutils-DIR_COLORS.256color, 1.2, 1.3 coreutils-DIR_COLORS.xterm, 1.3, 1.4 coreutils.spec, 1.211, 1.212

Ondrej Vasik (ovasik) fedora-extras-commits at redhat.com
Mon May 19 11:32:17 UTC 2008


Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18000

Modified Files:
	coreutils-6.10-configuration.patch coreutils-DIR_COLORS 
	coreutils-DIR_COLORS.256color coreutils-DIR_COLORS.xterm 
	coreutils.spec 
Log Message:
added arch utility (from util-linux-ng) + do not show executable file types without executable bit in colored ls as executable

coreutils-6.10-configuration.patch:

Index: coreutils-6.10-configuration.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- coreutils-6.10-configuration.patch	24 Apr 2008 14:57:35 -0000	1.7
+++ coreutils-6.10-configuration.patch	19 May 2008 11:31:08 -0000	1.8
@@ -1,15 +1,3 @@
-diff -urNp coreutils-6.11-orig/tests/touch/no-create-missing coreutils-6.11/tests/touch/no-create-missing
---- coreutils-6.11-orig/tests/touch/no-create-missing	2008-04-19 23:34:23.000000000 +0200
-+++ coreutils-6.11/tests/touch/no-create-missing	2008-04-24 12:34:52.000000000 +0200
-@@ -36,7 +36,7 @@ test="$abs_top_builddir/src/test"
- # This test is ineffective unless /dev/stdout also works.
- if "$test" -w /dev/stdout >/dev/null &&
-    "$test" ! -w /dev/stdout >&-; then
--  touch -c - >&- 2> /dev/null || fail=1
-+  strace touch -c - >&- || fail=1
-   touch -cm - >&- 2> /dev/null || fail=1
-   touch -ca - >&- 2> /dev/null || fail=1
- fi
 diff -urNp coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux
 --- coreutils-6.11-orig/tests/mkdir/selinux	2008-04-19 23:34:23.000000000 +0200
 +++ coreutils-6.11/tests/mkdir/selinux	2008-04-22 13:23:50.000000000 +0200


Index: coreutils-DIR_COLORS
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coreutils-DIR_COLORS	25 Jan 2008 17:48:11 -0000	1.3
+++ coreutils-DIR_COLORS	19 May 2008 11:31:08 -0000	1.4
@@ -95,13 +95,13 @@
 # to colorize below. Put the extension, a space, and the color init string.
 # (and any comments you want to add after a '#')
 # executables (bright green)
-.cmd 01;32 
-.exe 01;32
-.com 01;32
-.btm 01;32
-.bat 01;32
-.sh  01;32
-.csh 01;32
+#.cmd 01;32 
+#.exe 01;32
+#.com 01;32
+#.btm 01;32
+#.bat 01;32
+#.sh  01;32
+#.csh 01;32
  # archives or compressed (bright red)
 .tar 01;31 
 .tgz 01;31


Index: coreutils-DIR_COLORS.256color
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.256color,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coreutils-DIR_COLORS.256color	7 Feb 2008 15:10:39 -0000	1.2
+++ coreutils-DIR_COLORS.256color	19 May 2008 11:31:08 -0000	1.3
@@ -73,13 +73,13 @@
 # to colorize below. Put the extension, a space, and the color init string.
 # (and any comments you want to add after a '#')
 # executables (bright green)
-.cmd 01;38;5;34
-.exe 01;38;5;34
-.com 01;38;5;34
-.btm 01;38;5;34
-.bat 01;38;5;34
-.sh  01;38;5;34
-.csh 01;38;5;34
+#.cmd 01;38;5;34
+#.exe 01;38;5;34
+#.com 01;38;5;34
+#.btm 01;38;5;34
+#.bat 01;38;5;34
+#.sh  01;38;5;34
+#.csh 01;38;5;34
  # archives or compressed (bright red)
 .tar 01;38;5;9 
 .tgz 01;38;5;9


Index: coreutils-DIR_COLORS.xterm
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.xterm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coreutils-DIR_COLORS.xterm	25 Jan 2008 17:48:11 -0000	1.3
+++ coreutils-DIR_COLORS.xterm	19 May 2008 11:31:08 -0000	1.4
@@ -76,13 +76,13 @@
 # List any file extensions like '.gz' or '.tar' that you would like ls
 # to colorize below. Put the extension, a space, and the color init string.
 # (and any comments you want to add after a '#')
-.cmd 00;32 # executables (green)
-.exe 00;32
-.com 00;32
-.btm 00;32
-.bat 00;32
-.sh  00;32
-.csh 00;32
+#.cmd 00;32 # executables (green)
+#.exe 00;32
+#.com 00;32
+#.btm 00;32
+#.bat 00;32
+#.sh  00;32
+#.csh 00;32
  # archives or compressed (red)
 .tar 00;31 
 .tgz 00;31


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- coreutils.spec	24 Apr 2008 14:57:35 -0000	1.211
+++ coreutils.spec	19 May 2008 11:31:08 -0000	1.212
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 6.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -58,7 +58,6 @@
 BuildRequires: texinfo >= 4.3
 BuildRequires: lzma
 BuildRequires: autoconf >= 2.58
-BuildRequires: strace
 #dist-lzma required
 BuildRequires: automake >= 1.10.1 
 %{?!nopam:BuildRequires: pam-devel}
@@ -155,7 +154,7 @@
 automake --copy --add-missing
 %configure --enable-largefile --with-afs %{?!nopam:--enable-pam} \
            --enable-selinux \
-           --enable-install-program=su,hostname \
+           --enable-install-program=su,hostname,arch \
            DEFAULT_POSIX2_VERSION=200112 alternative=199209 || :
 make all %{?_smp_mflags} \
          %{?!nopam:CPPFLAGS="-DUSE_PAM"} \
@@ -187,7 +186,7 @@
 # let be compatible with old fileutils, sh-utils and textutils packages :
 mkdir -p $RPM_BUILD_ROOT{/bin,%_bindir,%_sbindir,/sbin}
 %{?!nopam:mkdir -p $RPM_BUILD_ROOT%_sysconfdir/pam.d}
-for f in basename cat chgrp chmod chown cp cut date dd df echo env false link ln ls mkdir mknod mktemp mv nice pwd rm rmdir sleep sort stty sync touch true uname unlink
+for f in arch basename cat chgrp chmod chown cp cut date dd df echo env false link ln ls mkdir mknod mktemp mv nice pwd rm rmdir sleep sort stty sync touch true uname unlink
 do
     mv $RPM_BUILD_ROOT{%_bindir,/bin}/$f 
 done
@@ -267,6 +266,7 @@
 %{?!nopam:%config(noreplace) %{_sysconfdir}/pam.d/runuser}
 %{?!nopam:%config(noreplace) %{_sysconfdir}/pam.d/runuser-l}
 %doc COPYING ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/*
+/bin/arch
 /bin/basename
 /bin/cat
 /bin/chgrp
@@ -307,6 +307,11 @@
 /sbin/runuser
 
 %changelog
+* Mon May 19 2008 Ondrej Vasik <ovasik at redhat.com> - 6.11-3
+- added arch utility (from util-linux-ng)
+- do not show executable file types without executable bit
+  in colored ls as executable
+
 * Wed Apr 23 2008 Ondrej Vasik <ovasik at redhat.com> - 6.11-2
 - Do not show misleading scontext in id command when user
   is specified (#443485)




More information about the fedora-extras-commits mailing list