rpms/coreutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Ship COPYING file (bug #225655).

Browse Source 
- Use datadir and infodir macros in %pre scriptlet (bug #225655).
- Use spaces not tabs (bug #225655).
- Fixed build root.
- Change prereq to requires (bug #225655).
- Explicitly version some obsoletes tags (bug #225655).
- Removed obsolete pl translation fix.
- Resolves: rhbz#225655 rhbz#225655 rhbz#225655 rhbz#225655 rhbz#225655
This commit is contained in:
Tim Waugh 2007-02-13 10:15:38 +00:00
parent d705d9f83c
commit 6f64447fd4
1 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
coreutils.spec
View File

@ -1,17 +1,14 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 6.7 Version: 6.7
Release: 3%{?dist} Release: 4%{?dist}
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
BuildRequires: libselinux-devel >= 1.25.6-1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libacl-devel
Requires: libselinux >= 1.25.6-1
Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
Source101: DIR_COLORS Source101: DIR_COLORS
Source102: DIR_COLORS.xterm Source102: DIR_COLORS.xterm
Source105: colorls.sh Source105: colorls.sh
Source106: colorls.csh Source106: colorls.csh
Source200: su.pamd Source200: su.pamd
@ -46,23 +43,26 @@ Patch915: coreutils-split-pam.patch
#SELINUX Patch #SELINUX Patch
Patch950: coreutils-selinux.patch Patch950: coreutils-selinux.patch
BuildRoot: %_tmppath/%{name}-root BuildRequires: libselinux-devel >= 1.25.6-1
BuildRequires: gettext bison BuildRequires: libacl-devel
%{?!nopam:BuildRequires: pam-devel} BuildRequires: gettext bison
BuildRequires: texinfo >= 4.3 BuildRequires: texinfo >= 4.3
BuildRequires: autoconf >= 2.58, automake >= 1.8 BuildRequires: autoconf >= 2.58, automake >= 1.8
Prereq: /sbin/install-info %{?!nopam:BuildRequires: pam-devel}
Requires: libselinux >= 1.25.6-1
Requires: /sbin/install-info
Requires: grep, findutils
%{?!nopam:Requires: pam >= 0.66-12} %{?!nopam:Requires: pam >= 0.66-12}
Prereq: grep, findutils
# Require a C library that doesn't put LC_TIME files in our way. # Require a C library that doesn't put LC_TIME files in our way.
Conflicts: glibc < 2.2 Conflicts: glibc < 2.2
Provides: fileutils = %version, sh-utils = %version, stat, textutils = %version Provides: fileutils = %version, sh-utils = %version, stat, textutils = %version
Obsoletes: fileutils sh-utils stat textutils Obsoletes: fileutils <= %version, sh-utils <= %version, stat, textutils <= %version
# readlink(1) moved here from tetex. # readlink(1) moved here from tetex.
Conflicts: tetex < 1.0.7-66 Conflicts: tetex < 1.0.7-66
%description %description
These are the GNU core utilities. This package is the combination of These are the GNU core utilities. This package is the combination of
@ -115,23 +115,19 @@ aclocal -I m4
autoconf --force autoconf --force
automake --copy --add-missing automake --copy --add-missing
%configure --enable-largefile --with-afs %{?!nopam:--enable-pam} \ %configure --enable-largefile --with-afs %{?!nopam:--enable-pam} \
--enable-selinux \ --enable-selinux \
DEFAULT_POSIX2_VERSION=200112 alternative=199209 || : DEFAULT_POSIX2_VERSION=200112 alternative=199209 || :
make all %{?_smp_mflags} \ make all %{?_smp_mflags} \
%{?!nopam:CPPFLAGS="-DUSE_PAM"} \ %{?!nopam:CPPFLAGS="-DUSE_PAM"} \
su_LDFLAGS="-pie %{?!nopam:-lpam -lpam_misc}" su_LDFLAGS="-pie %{?!nopam:-lpam -lpam_misc}"
[[ -f ChangeLog && -f ChangeLog.bz2 ]] || bzip2 -9f ChangeLog [[ -f ChangeLog && -f ChangeLog.bz2 ]] || bzip2 -9f ChangeLog
# Run the test suite.
make check
# XXX docs should say /var/run/[uw]tmp not /etc/[uw]tmp # XXX docs should say /var/run/[uw]tmp not /etc/[uw]tmp
perl -pi -e 's,/etc/utmp,/var/run/utmp,g;s,/etc/wtmp,/var/run/wtmp,g' doc/coreutils.texi perl -pi -e 's,/etc/utmp,/var/run/utmp,g;s,/etc/wtmp,/var/run/wtmp,g' doc/coreutils.texi
pushd po %check
make pl.gmo make check
popd
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -144,7 +140,7 @@ make mandir=$RPM_BUILD_ROOT%{_mandir} install-man
if [ -d $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC/LC_MESSAGES ]; then if [ -d $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC/LC_MESSAGES ]; then
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/locale/ja/LC_MESSAGES mkdir -p $RPM_BUILD_ROOT/%{_datadir}/locale/ja/LC_MESSAGES
mv $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC/LC_MESSAGES/*mo \ mv $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC/LC_MESSAGES/*mo \
$RPM_BUILD_ROOT/%{_datadir}/locale/ja/LC_MESSAGES $RPM_BUILD_ROOT/%{_datadir}/locale/ja/LC_MESSAGES
rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC
fi fi
@ -153,7 +149,7 @@ mkdir -p $RPM_BUILD_ROOT{/bin,%_bindir,%_sbindir,/sbin}
%{?!nopam:mkdir -p $RPM_BUILD_ROOT%_sysconfdir/pam.d} %{?!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 mv nice pwd rm rmdir sleep sort stty sync touch true uname unlink for f in basename cat chgrp chmod chown cp cut date dd df echo env false link ln ls mkdir mknod mv nice pwd rm rmdir sleep sort stty sync touch true uname unlink
do do
mv $RPM_BUILD_ROOT/{%_bindir,bin}/$f mv $RPM_BUILD_ROOT/{%_bindir,bin}/$f
done done
# chroot was in /usr/sbin : # chroot was in /usr/sbin :
@ -173,7 +169,7 @@ install -m 755 src/runuser $RPM_BUILD_ROOT/sbin
# These come from util-linux and/or procps. # These come from util-linux and/or procps.
for i in hostname uptime kill ; do for i in hostname uptime kill ; do
rm -f $RPM_BUILD_ROOT{%_bindir/$i,%_mandir/man1/$i.1} rm -f $RPM_BUILD_ROOT{%_bindir/$i,%_mandir/man1/$i.1}
done done
%{?!nopam:install -m 644 %SOURCE200 $RPM_BUILD_ROOT%_sysconfdir/pam.d/su} %{?!nopam:install -m 644 %SOURCE200 $RPM_BUILD_ROOT%_sysconfdir/pam.d/su}
@ -186,23 +182,23 @@ bzip2 -f9 old/*/C* || :
%find_lang %name %find_lang %name
# (sb) Deal with Installed (but unpackaged) file(s) found # (sb) Deal with Installed (but unpackaged) file(s) found
rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%pre %pre
# Remove these old glibc files on upgrade (bug #84090). # Remove these old glibc files on upgrade (bug #84090).
for file in $(find /usr/share/locale -type f -name LC_TIME); do for file in $(find %{_datadir}/locale -type f -name LC_TIME); do
[ -x /bin/rm ] && /bin/rm -f "$file" [ -x /bin/rm ] && /bin/rm -f "$file"
done done
# We must desinstall theses info files since they're merged in # We must desinstall theses info files since they're merged in
# coreutils.info. else their postun'll be runned too last # coreutils.info. else their postun'll be runned too last
# and install-info'll faill badly because of doubles # and install-info'll faill badly because of doubles
for file in sh-utils.info textutils.info fileutils.info; do for file in sh-utils.info textutils.info fileutils.info; do
if [ -f /usr/share/info/$file.bz2 ]; then if [ -f %{_infodir}/$file.bz2 ]; then
/sbin/install-info /usr/share/info/$file.bz2 --dir=/usr/share/info/dir --remove &> /dev/null || : /sbin/install-info %{_infodir}/$file.bz2 --dir=%{_infodir}/dir --remove &> /dev/null || :
fi fi
done done
@ -210,7 +206,7 @@ done
if [ $1 = 0 ]; then if [ $1 = 0 ]; then
[ -f %{_infodir}/%{name}.info.gz ] && \ [ -f %{_infodir}/%{name}.info.gz ] && \
/sbin/install-info --delete %{_infodir}/%{name}.info.gz \ /sbin/install-info --delete %{_infodir}/%{name}.info.gz \
%{_infodir}/dir || : %{_infodir}/dir || :
fi fi
%post %post
@ -229,7 +225,7 @@ fi
%{?!nopam:%config(noreplace) /etc/pam.d/su-l} %{?!nopam:%config(noreplace) /etc/pam.d/su-l}
%{?!nopam:%config(noreplace) /etc/pam.d/runuser} %{?!nopam:%config(noreplace) /etc/pam.d/runuser}
%{?!nopam:%config(noreplace) /etc/pam.d/runuser-l} %{?!nopam:%config(noreplace) /etc/pam.d/runuser-l}
%doc ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/* %doc COPYING ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/*
/bin/basename /bin/basename
/bin/cat /bin/cat
/bin/chgrp /bin/chgrp
@ -269,6 +265,15 @@ fi
/sbin/runuser /sbin/runuser
%changelog %changelog
* Tue Feb 13 2007 Tim Waugh <twaugh@redhat.com> 6.7-4
- Ship COPYING file (bug #225655).
- Use datadir and infodir macros in %%pre scriptlet (bug #225655).
- Use spaces not tabs (bug #225655).
- Fixed build root.
- Change prereq to requires (bug #225655).
- Explicitly version some obsoletes tags (bug #225655).
- Removed obsolete pl translation fix.
* Mon Jan 22 2007 Tim Waugh <twaugh@redhat.com> 6.7-3 * Mon Jan 22 2007 Tim Waugh <twaugh@redhat.com> 6.7-3
- Make scriptlet unconditionally succeed (bug #223681). - Make scriptlet unconditionally succeed (bug #223681).