rpms/coreutils/devel coreutils-7.5-kojiutimensatskip.patch, NONE, 1.1 coreutils-DIR_COLORS, 1.6, 1.7 coreutils-DIR_COLORS.256color, 1.5, 1.6 coreutils-DIR_COLORS.lightbgcolor, 1.1, 1.2 coreutils.spec, 1.267, 1.268
Ondrej Vasik
ovasik at fedoraproject.org
Fri Aug 21 11:49:03 UTC 2009
Author: ovasik
Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12047
Modified Files:
coreutils-DIR_COLORS coreutils-DIR_COLORS.256color
coreutils-DIR_COLORS.lightbgcolor coreutils.spec
Added Files:
coreutils-7.5-kojiutimensatskip.patch
Log Message:
libstdbuf.so in separate coreutils-libs subpackage, update /etc/DIRCOLORS*, skip two new tests on system with insufficient utimensat support(e.g. koji)
coreutils-7.5-kojiutimensatskip.patch:
cp/preserve-slink-time | 4 ++++
mv/part-symlink | 2 ++
2 files changed, 6 insertions(+)
--- NEW FILE coreutils-7.5-kojiutimensatskip.patch ---
diff -urNp coreutils-7.5-orig/tests/cp/preserve-slink-time coreutils-7.5/tests/cp/preserve-slink-time
--- coreutils-7.5-orig/tests/cp/preserve-slink-time 2009-08-15 17:25:32.000000000 +0200
+++ coreutils-7.5/tests/cp/preserve-slink-time 2009-08-21 12:45:41.000000000 +0200
@@ -28,6 +28,10 @@ grep '^#define HAVE_UTIMENSAT' "$CONFIG_
ln -s no-such dangle || framework_failure
+cp -Pp dangle d3 2>error
+grep 'Function not implemented' error > /dev/null &&
+ skip_test_ 'utimensat function not implemented'
+
# If the current file system lacks sub-second resolution, sleep for 2s to
# ensure that the times on the copy are different from those of the original.
case $(stat --format=%y dangle) in
diff -urNp coreutils-7.5-orig/tests/mv/part-symlink coreutils-7.5/tests/mv/part-symlink
--- coreutils-7.5-orig/tests/mv/part-symlink 2009-08-15 17:25:32.000000000 +0200
+++ coreutils-7.5/tests/mv/part-symlink 2009-08-21 12:52:13.000000000 +0200
@@ -201,6 +201,8 @@ cat <<\EOF > $expected
EOF
+grep 'Function not implemented' $actual > /dev/null &&
+ skip_test_ 'utimensat function not implemented'
# Redirect to stderr, since stdout is already taken.
compare $expected $actual 1>&2 || fail=1
Index: coreutils-DIR_COLORS
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- coreutils-DIR_COLORS 24 Feb 2009 11:53:37 -0000 1.6
+++ coreutils-DIR_COLORS 21 Aug 2009 11:49:02 -0000 1.7
@@ -50,6 +50,7 @@ TERM rxvt-cygwin-native
TERM rxvt-unicode
TERM screen
TERM screen-256color
+TERM screen-256color-bce
TERM screen-bce
TERM screen-w
TERM screen.linux
@@ -78,7 +79,7 @@ RESET 0 # reset to "normal" color
DIR 01;34 # directory
LINK 01;36 # symbolic link (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.)
-HARDLINK 44;37 # regular file with more than one link
+MULTIHARDLINK 00 # regular file with more than one link
FIFO 40;33 # pipe
SOCK 01;35 # socket
DOOR 01;35 # door
@@ -115,12 +116,16 @@ EXEC 01;32
.taz 01;31
.lzh 01;31
.lzma 01;31
+.tlz 01;31
+.txz 01;31
.zip 01;31
.z 01;31
.Z 01;31
.dz 01;31
.gz 01;31
+.xz 01;31
.bz2 01;31
+.tbz 01;31
.tbz2 01;31
.bz 01;31
.tz 01;31
@@ -133,7 +138,7 @@ EXEC 01;32
.cpio 01;31
.7z 01;31
.rz 01;31
-.xz 01;31
+
# image formats (magenta)
.jpg 01;35
.jpeg 01;35
@@ -148,6 +153,8 @@ EXEC 01;32
.tif 01;35
.tiff 01;35
.png 01;35
+.svg 01;35
+.svgz 01;35
.mng 01;35
.pcx 01;35
.mov 01;35
@@ -175,13 +182,13 @@ EXEC 01;32
.xcf 01;35
.xwd 01;35
.yuv 01;35
-.svg 01;35
-.svgz 01;35
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axv 01;35
.anx 01;35
.ogv 01;35
.ogx 01;35
+
# audio formats (cyan)
.aac 01;36
.au 01;36
@@ -194,6 +201,7 @@ EXEC 01;32
.ogg 01;36
.ra 01;36
.wav 01;36
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axa 01;36
.oga 01;36
Index: coreutils-DIR_COLORS.256color
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.256color,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- coreutils-DIR_COLORS.256color 24 Feb 2009 11:53:37 -0000 1.5
+++ coreutils-DIR_COLORS.256color 21 Aug 2009 11:49:02 -0000 1.6
@@ -55,7 +55,7 @@ RESET 0 # reset to "normal" color
DIR 01;38;5;27 # directory
LINK 01;38;5;51 # symbolic link (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.)
-HARDLINK 44;38;5;15; # regular file with more than one link
+MULTIHARDLINK 44;38;5;15; # regular file with more than one link
FIFO 40;38;5;11 # pipe
SOCK 01;38;5;13 # socket
DOOR 01;38;5;5 # door
@@ -91,12 +91,16 @@ EXEC 01;38;5;34
.taz 01;38;5;9
.lzh 01;38;5;9
.lzma 01;38;5;9
+.tlz 01;38;5;9
+.txz 01;38;5;9
.zip 01;38;5;9
.z 01;38;5;9
.Z 01;38;5;9
.dz 01;38;5;9
.gz 01;38;5;9
+.xz 01;38;5;9
.bz2 01;38;5;9
+.tbz 01;38;5;9
.tbz2 01;38;5;9
.bz 01;38;5;9
.tz 01;38;5;9
@@ -109,7 +113,7 @@ EXEC 01;38;5;34
.cpio 01;38;5;9
.7z 01;38;5;9
.rz 01;38;5;9
-.xz 01;38;5;9
+
# image formats (magenta)
.jpg 01;38;5;13
.jpeg 01;38;5;13
@@ -124,6 +128,8 @@ EXEC 01;38;5;34
.tif 01;38;5;13
.tiff 01;38;5;13
.png 01;38;5;13
+.svg 01;38;5;13
+.svgz 01;38;5;13
.mng 01;38;5;13
.pcx 01;38;5;13
.mov 01;38;5;13
@@ -151,13 +157,13 @@ EXEC 01;38;5;34
.xcf 01;38;5;13
.xwd 01;38;5;13
.yuv 01;38;5;13
-.svg 01;38;5;13
-.svgz 01;38;5;13
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axv 01;38;5;13
.anx 01;38;5;13
.ogv 01;38;5;13
.ogx 01;38;5;13
+
# audio formats (cyan)
.aac 01;38;5;45
.au 01;38;5;45
@@ -170,6 +176,7 @@ EXEC 01;38;5;34
.ogg 01;38;5;45
.ra 01;38;5;45
.wav 01;38;5;45
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axa 01;38;5;45
.oga 01;38;5;45
Index: coreutils-DIR_COLORS.lightbgcolor
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.lightbgcolor,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- coreutils-DIR_COLORS.lightbgcolor 19 Mar 2009 14:56:48 -0000 1.1
+++ coreutils-DIR_COLORS.lightbgcolor 21 Aug 2009 11:49:02 -0000 1.2
@@ -58,7 +58,7 @@ RESET 0
DIR 00;34 # directory
LINK 00;36 # symbolic link (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.)
-HARDLINK 44;37 # regular file with more than one link
+MULTIHARDLINK 00 # regular file with more than one link
FIFO 40;33 # pipe
SOCK 00;35 # socket
DOOR 00;35 # door
@@ -94,12 +94,16 @@ EXEC 00;32
.taz 00;31
.lzh 00;31
.lzma 00;31
+.tlz 00;31
+.txz 00;31
.zip 00;31
.z 00;31
.Z 00;31
.dz 00;31
.gz 00;31
+.xz 00;31
.bz2 00;31
+.tbz 00;31
.tbz2 00;31
.bz 00;31
.tz 00;31
@@ -112,7 +116,6 @@ EXEC 00;32
.cpio 00;31
.7z 00;31
.rz 00;31
-.xz 00;31
# image formats (magenta)
.jpg 00;35
.jpeg 00;35
@@ -127,6 +130,8 @@ EXEC 00;32
.tif 00;35
.tiff 00;35
.png 00;35
+.svg 00;35
+.svgz 00;35
.mng 00;35
.pcx 00;35
.mov 00;35
@@ -154,13 +159,13 @@ EXEC 00;32
.xcf 00;35
.xwd 00;35
.yuv 00;35
-.svg 00;35
-.svgz 00;35
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axv 00;35
.anx 00;35
.ogv 00;35
.ogx 00;35
+
# audio formats (cyan)
.aac 00;36
.au 00;36
@@ -173,6 +178,7 @@ EXEC 00;32
.ogg 00;36
.ra 00;36
.wav 00;36
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axa 00;36
.oga 00;36
Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- coreutils.spec 21 Aug 2009 07:00:58 -0000 1.267
+++ coreutils.spec 21 Aug 2009 11:49:02 -0000 1.268
@@ -23,6 +23,7 @@ Source203: coreutils-runuser-l.pamd
Patch100: coreutils-6.10-configuration.patch
Patch101: coreutils-6.10-manpages.patch
Patch102: coreutils-7.4-sttytcsadrain.patch
+Patch103: coreutils-7.5-kojiutimensatskip.patch
# sh-utils
Patch703: sh-utils-2.0.11-dateman.patch
@@ -59,7 +60,6 @@ BuildRequires: automake >= 1.10.1
BuildRequires: libcap-devel >= 2.0.6
BuildRequires: libattr-devel
BuildRequires: attr
-BuildRequires: xz
Requires(post): libselinux >= 1.25.6-1
Requires: libattr
@@ -73,6 +73,7 @@ Requires(post): grep
%{?!nopam:Requires: pam >= 0.66-12}
Requires(post): libcap >= 2.0.6
Requires: ncurses
+Requires: %{name}-libs = %{version}-%{release}
# Require a C library that doesn't put LC_TIME files in our way.
Conflicts: glibc < 2.2
@@ -95,6 +96,14 @@ Conflicts: tetex < 1.0.7-66
These are the GNU core utilities. This package is the combination of
the old GNU fileutils, sh-utils, and textutils packages.
+%package libs
+Summary: Libraries for %{name}
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description libs
+Libraries for coreutils package.
+
%prep
%setup -q
@@ -104,6 +113,7 @@ the old GNU fileutils, sh-utils, and tex
%patch100 -p1 -b .configure
%patch101 -p1 -b .manpages
%patch102 -p1 -b .tcsadrain
+%patch103 -p1 -b .kojiutimensat
# sh-utils
%patch703 -p1 -b .dateman
@@ -313,10 +323,19 @@ fi
%_sbindir/chroot
/sbin/runuser
+%files libs
+%defattr(-, root, root, -)
+%{_libdir}/coreutils
+
%changelog
* Fri Aug 21 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-1
- New upstream release 7.5, remove already applied patches,
- defuzz few others
+ defuzz few others, xz in default set(by dependencies),
+ so no explicit br required
+- skip two new tests on system with insufficient utimensat
+ support(e.g. koji)
+- libstdbuf.so in separate coreutils-libs subpackage
+- update /etc/DIRCOLORS*
* Thu Aug 06 2009 Ondrej Vasik <ovasik at redhat.com> - 7.4-6
- do process install-info only with info files present(#515970)
More information about the scm-commits
mailing list