rpms/coreutils/devel .cvsignore, 1.20, 1.21 coreutils.spec, 1.264, 1.265 sources, 1.22, 1.23
Ondrej Vasik
ovasik at fedoraproject.org
Thu Aug 6 13:24:22 UTC 2009
Author: ovasik
Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7564
Modified Files:
.cvsignore coreutils.spec sources
Log Message:
do process install-info only with info files present(#515970), BuildRequire for xz-utils, use xz tarball
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore 25 May 2009 12:11:34 -0000 1.20
+++ .cvsignore 6 Aug 2009 13:24:22 -0000 1.21
@@ -1 +1 @@
-coreutils-7.4.tar.gz
+coreutils-7.4.tar.xz
Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -r1.264 -r1.265
--- coreutils.spec 5 Aug 2009 08:45:05 -0000 1.264
+++ coreutils.spec 6 Aug 2009 13:24:22 -0000 1.265
@@ -1,13 +1,12 @@
Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils
Version: 7.4
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Using .tar.gz tarball until xz utils will be in Fedora
-Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
Source101: coreutils-DIR_COLORS
Source102: coreutils-DIR_COLORS.lightbgcolor
Source103: coreutils-DIR_COLORS.256color
@@ -62,6 +61,7 @@ BuildRequires: automake >= 1.10.1
BuildRequires: libcap-devel >= 2.0.6
BuildRequires: libattr-devel
BuildRequires: attr
+BuildRequires: xz-utils
Requires(post): libselinux >= 1.25.6-1
Requires: libattr
@@ -247,19 +247,25 @@ rm -rf $RPM_BUILD_ROOT
# coreutils.info. else their postun'll be run too late
# and install-info will fail badly because of duplicates
for file in sh-utils textutils fileutils; do
+ if [ -f %{_infodir}/$file.info ]; then
/sbin/install-info --delete %{_infodir}/$file.info --dir=%{_infodir}/dir &> /dev/null || :
+ fi
done
%preun
if [ $1 = 0 ]; then
+ if [ -f %{_infodir}/%{name}.info ]; then
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+ fi
fi
%post
/bin/grep -v '(sh-utils)\|(fileutils)\|(textutils)' %{_infodir}/dir > \
%{_infodir}/dir.rpmmodify || exit 0
/bin/mv -f %{_infodir}/dir.rpmmodify %{_infodir}/dir
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ -f %{_infodir}/%{name}.info ]; then
+ /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -312,6 +318,10 @@ fi
/sbin/runuser
%changelog
+* Thu Aug 06 2009 Ondrej Vasik <ovasik at redhat.com> - 7.4-6
+- do process install-info only with info files present(#515970)
+- BuildRequire for xz-utils, use xz tarball
+
* Wed Aug 05 2009 Kamil Dudka <kdudka at redhat.com> - 7.4-5
- ls -1U with two or more arguments (or with -R or -s) works properly again
- install runs faster again with SELinux enabled (#479502)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources 25 May 2009 12:11:34 -0000 1.22
+++ sources 6 Aug 2009 13:24:22 -0000 1.23
@@ -1 +1 @@
-c52f4f64dda9a245c38e74c09fdd86d2 coreutils-7.4.tar.gz
+e8d906c153f271430e3efb2b9a35a35f coreutils-7.4.tar.xz
More information about the fedora-extras-commits
mailing list