|
@@ -1,13 +1,13 @@
|
|
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
|
|
Summary(ja): GNU コアユーティリティ: シェルスクリプトで用いるツール集
|
|
Summary(ja): GNU コアユーティリティ: シェルスクリプトで用いるツール集
|
|
Name: coreutils
|
|
Name: coreutils
|
|
-Version: 6.11
|
|
+Version: 8.10
|
|
Release: 2%{?_dist_release}
|
|
Release: 2%{?_dist_release}
|
|
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/
|
|
|
|
|
|
-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
|
|
Source101: coreutils-DIR_COLORS
|
|
Source102: coreutils-DIR_COLORS.xterm
|
|
Source102: coreutils-DIR_COLORS.xterm
|
|
Source103: coreutils-DIR_COLORS.256color
|
|
Source103: coreutils-DIR_COLORS.256color
|
|
@@ -19,15 +19,23 @@ Source202: coreutils-su-l.pamd
|
|
Source203: coreutils-runuser-l.pamd
|
|
Source203: coreutils-runuser-l.pamd
|
|
|
|
|
|
# Vine sources
|
|
# Vine sources
|
|
-Source1000: coreutils-5.94-ja.po
|
|
+Source1000: coreutils-8.10-ja.po
|
|
|
|
|
|
# From upstream
|
|
# From upstream
|
|
|
|
|
|
-
|
|
|
|
# Fedora patches
|
|
# Fedora patches
|
|
-Patch100: coreutils-chgrp.patch
|
|
+#general patch to workaround koji build system issues
|
|
-Patch102: coreutils-6.10-manpages.patch
|
|
+Patch100: coreutils-6.10-configuration.patch
|
|
-#Patch103: coreutils-6.10-longoptions.patch
|
|
+#add note about no difference between binary/text mode on Linux - md5sum manpage
|
|
|
|
+Patch101: coreutils-6.10-manpages.patch
|
|
|
|
+#temporarily workaround probable kernel issue with TCSADRAIN(#504798)
|
|
|
|
+Patch102: coreutils-7.4-sttytcsadrain.patch
|
|
|
|
+#do display processor type for uname -p/-i based on uname(2) syscall
|
|
|
|
+Patch103: coreutils-8.2-uname-processortype.patch
|
|
|
|
+#df --direct
|
|
|
|
+Patch104: coreutils-df-direct.patch
|
|
|
|
+#add jar-like archives to colored ones
|
|
|
|
+Patch106: coreutils-8.5-dircolors.patch
|
|
|
|
|
|
# sh-utils
|
|
# sh-utils
|
|
#Patch703: sh-utils-2.0.11-dateman.patch
|
|
#Patch703: sh-utils-2.0.11-dateman.patch
|
|
@@ -35,28 +43,37 @@ Patch704: sh-utils-1.16-paths.patch
|
|
# RMS will never accept the PAM patch because it removes his historical
|
|
# RMS will never accept the PAM patch because it removes his historical
|
|
# rant about Twenex and the wheel group, so we'll continue to maintain
|
|
# rant about Twenex and the wheel group, so we'll continue to maintain
|
|
# it here indefinitely.
|
|
# it here indefinitely.
|
|
-Patch706: coreutils-pam.patch
|
|
+Patch706: coreutils-8.5-pam.patch
|
|
Patch713: coreutils-4.5.3-langinfo.patch
|
|
Patch713: coreutils-4.5.3-langinfo.patch
|
|
-Patch715: coreutils-4.5.3-sysinfo.patch
|
|
|
|
|
|
|
|
# (sb) lin18nux/lsb compliance
|
|
# (sb) lin18nux/lsb compliance
|
|
-Patch800: coreutils-i18n.patch
|
|
+Patch800: coreutils-8.10-i18n.patch
|
|
|
|
|
|
|
|
+#Call setsid() in su under some circumstances (bug #173008).
|
|
Patch900: coreutils-setsid.patch
|
|
Patch900: coreutils-setsid.patch
|
|
-Patch907: coreutils-5.2.1-runuser.patch
|
|
+#make runuser binary based on su.c
|
|
|
|
+Patch907: coreutils-8.7-runuser.patch
|
|
|
|
+#getgrouplist() patch from Ulrich Drepper.
|
|
Patch908: coreutils-getgrouplist.patch
|
|
Patch908: coreutils-getgrouplist.patch
|
|
|
|
+#Prevent buffer overflow in who(1) (bug #158405).
|
|
Patch912: coreutils-overflow.patch
|
|
Patch912: coreutils-overflow.patch
|
|
-Patch915: coreutils-split-pam.patch
|
|
+#compile su with pie flag and RELRO protection
|
|
-Patch916: coreutils-getfacl-exit-code.patch
|
|
+Patch917: coreutils-8.4-su-pie.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRequires: gettext libtermcap-devel bison
|
|
BuildRequires: gettext libtermcap-devel bison
|
|
%{?!nopam:BuildRequires: pam-devel}
|
|
%{?!nopam:BuildRequires: pam-devel}
|
|
BuildRequires: texinfo >= 4.3
|
|
BuildRequires: texinfo >= 4.3
|
|
BuildRequires: autoconf >= 2.58, automake >= 1.10
|
|
BuildRequires: autoconf >= 2.58, automake >= 1.10
|
|
-Prereq: install-info
|
|
|
|
%{?!nopam:Requires: pam >= 0.66-12}
|
|
%{?!nopam:Requires: pam >= 0.66-12}
|
|
-Prereq: grep, findutils
|
|
+BuildRequires: libcap-devel
|
|
|
|
+BuildRequires: libattr-devel
|
|
|
|
+BuildRequires: libacl-devel
|
|
|
|
+BuildRequires: gmp-devel
|
|
|
|
+
|
|
|
|
+Requires(pre): install-info
|
|
|
|
+Requires(preun): install-info
|
|
|
|
+Requires(post): install-info, 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
|
|
@@ -84,15 +101,17 @@ sh-utils, textutils を統合したパッケージです。
|
|
|
|
|
|
# Fedora patches
|
|
# Fedora patches
|
|
%patch100 -p1 -b .chgrp
|
|
%patch100 -p1 -b .chgrp
|
|
-%patch102 -p1 -b .manpages
|
|
+%patch101 -p1 -b .manpages
|
|
-#%patch103 -p1 -b .longopt
|
|
+%patch102 -p1 -b .tcsadrain
|
|
|
|
+%patch103 -p1 -b .sysinfo
|
|
|
|
+%patch104 -p1 -b .dfdirect
|
|
|
|
+%patch106 -p1 -b .java
|
|
|
|
|
|
# sh-utils
|
|
# sh-utils
|
|
#%patch703 -p1 -b .dateman
|
|
#%patch703 -p1 -b .dateman
|
|
%patch704 -p1 -b .paths
|
|
%patch704 -p1 -b .paths
|
|
%patch706 -p1 -b .pam
|
|
%patch706 -p1 -b .pam
|
|
%patch713 -p1 -b .langinfo
|
|
%patch713 -p1 -b .langinfo
|
|
-%patch715 -p1 -b .sysinfo
|
|
|
|
|
|
|
|
# li18nux/lsb
|
|
# li18nux/lsb
|
|
%patch800 -p1 -b .i18n
|
|
%patch800 -p1 -b .i18n
|
|
@@ -102,26 +121,26 @@ sh-utils, textutils を統合したパッケージです。
|
|
%patch907 -p1 -b .runuser
|
|
%patch907 -p1 -b .runuser
|
|
%patch908 -p1 -b .getgrouplist
|
|
%patch908 -p1 -b .getgrouplist
|
|
%patch912 -p1 -b .overflow
|
|
%patch912 -p1 -b .overflow
|
|
-%patch915 -p1 -b .splitl
|
|
+%patch917 -p1 -b .pie
|
|
-%patch916 -p1 -b .getfacl-exit-code
|
|
|
|
|
|
|
|
# copy updated ja.po
|
|
# copy updated ja.po
|
|
mv po/ja.po po/ja.po.orig
|
|
mv po/ja.po po/ja.po.orig
|
|
cp -f %{SOURCE1000} po/ja.po
|
|
cp -f %{SOURCE1000} po/ja.po
|
|
|
|
|
|
%build
|
|
%build
|
|
-%ifarch s390 s390x
|
|
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fpic"
|
|
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
|
|
|
|
-%else
|
|
|
|
-export CFLAGS="$RPM_OPT_FLAGS -fpic"
|
|
|
|
-%endif
|
|
|
|
%{expand:%%global optflags %{optflags} -D_GNU_SOURCE=1}
|
|
%{expand:%%global optflags %{optflags} -D_GNU_SOURCE=1}
|
|
-touch aclocal.m4 configure config.hin Makefile.in */Makefile.in */*/Makefile.in
|
|
+touch aclocal.m4 configure config.hin Makefile.in */Makefile.in
|
|
aclocal -I m4
|
|
aclocal -I m4
|
|
autoconf --force
|
|
autoconf --force
|
|
-automake --copy --force
|
|
+automake --copy --force --add-missing
|
|
%configure --enable-largefile --with-afs %{?!nopam:--enable-pam} \
|
|
%configure --enable-largefile --with-afs %{?!nopam:--enable-pam} \
|
|
-|| :
|
|
+ --enable-install-program=su,hostname,arch \
|
|
|
|
+ --with-tty-group \
|
|
|
|
+ DEFAULT_POSIX2_VERSION=200112 alternative=199209 || :
|
|
|
|
+
|
|
|
|
+touch man/*.x
|
|
|
|
+
|
|
%__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}"
|
|
@@ -130,10 +149,6 @@ automake --copy --force
|
|
|
|
|
|
[[ -f ChangeLog && -f ChangeLog.bz2 ]] || bzip2 -9f ChangeLog
|
|
[[ -f ChangeLog && -f ChangeLog.bz2 ]] || bzip2 -9f ChangeLog
|
|
|
|
|
|
-# disable make check, because some tests can not run in non-root user.
|
|
|
|
-## 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
|
|
|
|
|
|
@@ -170,7 +185,7 @@ for i in env cut; do ln -sf ../../bin/$i $RPM_BUILD_ROOT/usr/bin; done
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
|
|
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
|
|
install -p -c -m644 %SOURCE101 $RPM_BUILD_ROOT%{_sysconfdir}/DIR_COLORS
|
|
install -p -c -m644 %SOURCE101 $RPM_BUILD_ROOT%{_sysconfdir}/DIR_COLORS
|
|
-install -p -c -m644 %SOURCE102 $RPM_BUILD_ROOT%{_sysconfdir}/DIR_COLORS.xterm
|
|
+install -p -c -m644 %SOURCE102 $RPM_BUILD_ROOT%{_sysconfdir}/DIR_COLORS.lightbgcolor
|
|
install -p -c -m644 %SOURCE103 $RPM_BUILD_ROOT%{_sysconfdir}/DIR_COLORS.256color
|
|
install -p -c -m644 %SOURCE103 $RPM_BUILD_ROOT%{_sysconfdir}/DIR_COLORS.256color
|
|
install -p -c -m644 %SOURCE105 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.sh
|
|
install -p -c -m644 %SOURCE105 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.sh
|
|
install -p -c -m644 %SOURCE106 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.csh
|
|
install -p -c -m644 %SOURCE106 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.csh
|
|
@@ -244,12 +259,20 @@ fi
|
|
%doc COPYING ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/*
|
|
%doc COPYING ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/*
|
|
/bin/*
|
|
/bin/*
|
|
%{_bindir}/*
|
|
%{_bindir}/*
|
|
|
|
+%{_libdir}/coreutils
|
|
%{_infodir}/coreutils*
|
|
%{_infodir}/coreutils*
|
|
%{_mandir}/man*/*
|
|
%{_mandir}/man*/*
|
|
%{_sbindir}/chroot
|
|
%{_sbindir}/chroot
|
|
/sbin/runuser
|
|
/sbin/runuser
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Apr 02 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 8.10-2
|
|
|
|
+- update ja.po
|
|
|
|
+- add BR: libcap-devel, gmp-devel, libattr-devel, libacl-devel
|
|
|
|
+
|
|
|
|
+* Sat Feb 05 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 8.10-1
|
|
|
|
+- update to 8.10
|
|
|
|
+
|
|
* Mon Sep 29 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 6.11-2
|
|
* Mon Sep 29 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 6.11-2
|
|
- rebuilt against curent toolchain
|
|
- rebuilt against curent toolchain
|
|
- spec in UTF-8
|
|
- spec in UTF-8
|