|
@@ -1,13 +1,13 @@
|
|
|
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
|
|
|
Summary(ja): GNU コアユーティリティ: シェルスクリプトで用いるツール集
|
|
|
Name: coreutils
|
|
|
-Version: 8.25
|
|
|
+Version: 8.32
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: GPL
|
|
|
Group: System Environment/Base
|
|
|
-Url: http://www.gnu.org/software/coreutils/
|
|
|
+Url: https://www.gnu.org/software/coreutils/
|
|
|
|
|
|
-Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
|
|
|
+Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
|
|
|
Source101: coreutils-DIR_COLORS
|
|
|
Source102: coreutils-DIR_COLORS.lightbgcolor
|
|
|
Source103: coreutils-DIR_COLORS.256color
|
|
@@ -20,31 +20,56 @@ Source1000: coreutils-8.10-ja.po
|
|
|
# From upstream
|
|
|
|
|
|
# Fedora patches
|
|
|
-#general patch to workaround koji build system issues
|
|
|
-Patch100: coreutils-6.10-configuration.patch
|
|
|
-#add note about no difference between binary/text mode on Linux - md5sum manpage
|
|
|
-Patch101: coreutils-6.10-manpages.patch
|
|
|
+# ls: restore 8.31 behavior on removed directories
|
|
|
+Patch1: coreutils-8.32-ls-removed-dir.patch
|
|
|
+
|
|
|
+# disable the test-lock gnulib test prone to deadlock
|
|
|
+Patch100: coreutils-8.26-test-lock.patch
|
|
|
+
|
|
|
+# require_selinux_(): use selinuxenabled(8) if available
|
|
|
+#Patch105: coreutils-8.26-selinuxenable.patch
|
|
|
+
|
|
|
+# downstream changes to default DIR_COLORS
|
|
|
+#Patch102: coreutils-8.32-DIR_COLORS.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 note about mkdir --mode behaviour into info documentation(#610559)
|
|
|
+Patch107: coreutils-8.4-mkdir-modenote.patch
|
|
|
|
|
|
# sh-utils
|
|
|
+#add info about TZ envvar to date manpage
|
|
|
+Patch703: sh-utils-2.0.11-dateman.patch
|
|
|
Patch713: coreutils-4.5.3-langinfo.patch
|
|
|
|
|
|
-# (sb) lin18nux/lsb compliance
|
|
|
+# (sb) lin18nux/lsb compliance - multibyte functionality patch
|
|
|
Patch800: coreutils-i18n.patch
|
|
|
# (sb) lin18nux/lsb compliance - expand/unexpand
|
|
|
Patch801: coreutils-i18n-expand-unexpand.patch
|
|
|
-# The unexpand patch above is not correct. Sent to the patch authors
|
|
|
-Patch803: coreutils-i18n-fix-unexpand.patch
|
|
|
# i18n patch for cut - old version - used
|
|
|
Patch804: coreutils-i18n-cut-old.patch
|
|
|
+# The unexpand patch above is not correct. Sent to the patch authors
|
|
|
+Patch803: coreutils-i18n-fix-unexpand.patch
|
|
|
+#(un)expand - allow multiple files on input - broken by patch 801
|
|
|
+Patch805: coreutils-i18n-fix2-expand-unexpand.patch
|
|
|
+#(un)expand - test BOM headers
|
|
|
+Patch806: coreutils-i18n-un-expand-BOM.patch
|
|
|
+# make 'sort -h' work for arbitrary column even when using UTF-8 locales
|
|
|
+Patch807: coreutils-i18n-sort-human.patch
|
|
|
+# fold: preserve new-lines in mutlibyte text (#1418505)
|
|
|
+Patch808: coreutils-i18n-fold-newline.patch
|
|
|
|
|
|
#getgrouplist() patch from Ulrich Drepper.
|
|
|
Patch908: coreutils-getgrouplist.patch
|
|
|
-#Prevent buffer overflow in who(1) (bug #158405).
|
|
|
-Patch912: coreutils-overflow.patch
|
|
|
+
|
|
|
+#SELINUX Patch - implements Redhat changes
|
|
|
+#(upstream did some SELinux implementation unlike with RedHat patch)
|
|
|
+#Patch950: coreutils-selinux.patch
|
|
|
+
|
|
|
+# do not use IF_LINT for initialization of scalar variables
|
|
|
+Patch951: coreutils-8.32-if-lint.patch
|
|
|
+
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: gettext libtermcap-devel bison
|
|
@@ -78,34 +103,14 @@ sh-utils, textutils を統合したパッケージです。
|
|
|
|
|
|
|
|
|
%prep
|
|
|
-%setup -q
|
|
|
+%autosetup -N
|
|
|
|
|
|
-# From upstream
|
|
|
-
|
|
|
-# Fedora patches
|
|
|
-%patch100 -p1 -b .chgrp
|
|
|
-%patch101 -p1 -b .manpages
|
|
|
-%patch103 -p1 -b .sysinfo
|
|
|
-%patch104 -p1 -b .dfdirect
|
|
|
-
|
|
|
-# sh-utils
|
|
|
-#%patch703 -p1 -b .dateman
|
|
|
-#%patch706 -p1 -b .pam
|
|
|
-%patch713 -p1 -b .langinfo
|
|
|
-
|
|
|
-# li18nux/lsb
|
|
|
-%patch800 -p1 -b .i18n
|
|
|
-%patch801 -p1 -b .i18n-expand
|
|
|
-%patch803 -p1 -b .i18n-fix-expand
|
|
|
-%patch804 -p1 -b .i18n-cutold
|
|
|
-
|
|
|
-# Coreutils
|
|
|
-%patch908 -p1 -b .getgrouplist
|
|
|
-%patch912 -p1 -b .overflow
|
|
|
+# apply all patches
|
|
|
+%autopatch -p1
|
|
|
|
|
|
# copy updated ja.po
|
|
|
-mv po/ja.po po/ja.po.orig
|
|
|
-cp -f %{SOURCE1000} po/ja.po
|
|
|
+#mv po/ja.po po/ja.po.orig
|
|
|
+#cp -f %{SOURCE1000} po/ja.po
|
|
|
|
|
|
%build
|
|
|
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fpic"
|
|
@@ -115,7 +120,8 @@ aclocal -I m4
|
|
|
autoconf --force
|
|
|
automake --copy --force --add-missing
|
|
|
%configure --enable-largefile \
|
|
|
- --enable-install-program=hostname,arch \
|
|
|
+ --enable-install-program=arch \
|
|
|
+ --enable-no-install-program=kill,uptime \
|
|
|
--with-tty-group \
|
|
|
DEFAULT_POSIX2_VERSION=200112 alternative=199209 || :
|
|
|
|
|
@@ -125,8 +131,6 @@ touch man/*.x
|
|
|
|
|
|
%__make -C po update-gmo
|
|
|
|
|
|
-[[ -f ChangeLog && -f ChangeLog.bz2 ]] || bzip2 -9f ChangeLog
|
|
|
-
|
|
|
# XXX docs should say /var/run/[uw]tmp not /etc/[uw]tmp
|
|
|
sed -i -e 's,/etc/utmp,/var/run/utmp,g;s,/etc/wtmp,/var/run/wtmp,g' doc/coreutils.texi
|
|
|
|
|
@@ -172,8 +176,6 @@ for i in hostname uptime kill ; do
|
|
|
rm -f $RPM_BUILD_ROOT{%_bindir/$i,%_mandir/man1/$i.1}
|
|
|
done
|
|
|
|
|
|
-bzip2 -f9 old/*/C* || :
|
|
|
-
|
|
|
%find_lang %name
|
|
|
|
|
|
# (sb) Deal with Installed (but unpackaged) file(s) found
|
|
@@ -184,6 +186,13 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
|
|
|
#rm -f $RPM_BUILD_ROOT%{_mandir}/man1/readlink*
|
|
|
|
|
|
|
|
|
+%check
|
|
|
+# this test will fail on non-real filesystem (overlayfs, etc.).
|
|
|
+perl -pi -e 's|^.*inotify-dir-recreate.*$|\\|' tests/local.mk
|
|
|
+
|
|
|
+make check %{?_smp_mflags}
|
|
|
+
|
|
|
+
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
@@ -220,7 +229,8 @@ fi
|
|
|
%defattr(-,root,root)
|
|
|
%config(noreplace) %{_sysconfdir}/DIR_COLORS*
|
|
|
%config(noreplace) %{_sysconfdir}/profile.d/*
|
|
|
-%doc COPYING ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/*
|
|
|
+%license COPYING
|
|
|
+%doc ABOUT-NLS NEWS README THANKS TODO
|
|
|
/bin/*
|
|
|
%{_bindir}/*
|
|
|
%{_libexecdir}/coreutils
|
|
@@ -229,6 +239,10 @@ fi
|
|
|
%{_sbindir}/chroot
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.31-1
|
|
|
+- new upstream release.
|
|
|
+- updated all patches.
|
|
|
+
|
|
|
* Fri May 13 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 8.25-1
|
|
|
- update to 8.25
|
|
|
- remove Patch1,102
|