coreutils-9.0-1

c/coreutils/coreutils-vl.spec

@@ -1,10 +1,10 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Summary(ja): GNU コアユーティリティ: シェルスクリプトで用いるツール集
 Name:    coreutils
-Version: 8.32
+Version: 9.0
 Release: 1%{?_dist_release}
 License: GPL
-Group:   System Environment/Base
+Group:   system
 Url:     https://www.gnu.org/software/coreutils/
 
 Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
@@ -17,20 +17,17 @@ Source106:  coreutils-colorls.csh
 # Vine sources
 Source1000: coreutils-8.10-ja.po
 
-# From upstream
-
-# Fedora patches
-# ls: restore 8.31 behavior on removed directories
-Patch1:   coreutils-8.32-ls-removed-dir.patch
+# chmod: fix exit status when ignoring symlinks
+Patch1:   coreutils-9.0-chmod-symlink.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
+Patch105: coreutils-8.26-selinuxenable.patch
 
 # downstream changes to default DIR_COLORS
-#Patch102: coreutils-8.32-DIR_COLORS.patch
+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
@@ -45,20 +42,6 @@ Patch713: coreutils-4.5.3-langinfo.patch
 
 # (sb) lin18nux/lsb compliance - multibyte functionality patch
 Patch800: coreutils-i18n.patch
-# (sb) lin18nux/lsb compliance - expand/unexpand
-Patch801: coreutils-i18n-expand-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
@@ -67,9 +50,8 @@ Patch908: coreutils-getgrouplist.patch
 #(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
-
+# do not make coreutils-single depend on /usr/bin/coreutils
+%global __requires_exclude ^%{_bindir}/coreutils$
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires:	gettext libtermcap-devel bison
@@ -80,10 +62,6 @@ 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.
 Conflicts: glibc < 2.2
 
@@ -102,35 +80,60 @@ the old GNU fileutils, sh-utils, and textutils packages.
 sh-utils, textutils を統合したパッケージです。
 
 
+%debug_package
+
+
 %prep
 %autosetup -N
 
+# will be regenerated in the build directories
+rm -f src/fs.h
+
+# will be further modified by coreutils-8.32-DIR_COLORS.patch
+sed src/dircolors.hin \
+        -e 's| 00;36$| 01;36|' \
+        > DIR_COLORS
+sed src/dircolors.hin \
+        -e 's| 01;31$| 00;31|' \
+        -e 's| 01;35$| 00;35|' \
+        > DIR_COLORS.lightbgcolor
+
 # apply all patches
 %autopatch -p1
 
+(echo ">>> Fixing permissions on tests") 2>/dev/null
+find tests -name '*.sh' -perm 0644 -print -exec chmod 0755 '{}' '+'
+(echo "<<< done") 2>/dev/null
+
+autoreconf -fiv
+
 # copy updated 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"
+
+# Upstream suggests to build with -Dlint for static analyzers:
+# https://lists.gnu.org/archive/html/coreutils/2018-06/msg00110.html
+# ... and even for production binary RPMs:
+# https://lists.gnu.org/archive/html/bug-gnulib/2020-05/msg00130.html
+# There is currently no measurable performance drop or other known downside.
+CFLAGS="$CFLAGS -Dlint"
+
+# make mknod work again in chroot without /proc being mounted (#1811038)
+export ac_cv_func_lchmod="no"
+
 %{expand:%%global optflags %{optflags} -D_GNU_SOURCE=1}
-touch aclocal.m4 configure config.hin Makefile.in */Makefile.in
-aclocal -I m4
-autoconf --force
-automake --copy --force --add-missing
 %configure --enable-largefile \
            --enable-install-program=arch \
            --enable-no-install-program=kill,uptime \
            --with-tty-group \
            DEFAULT_POSIX2_VERSION=200112 alternative=199209 || :
 
-touch man/*.x
-
 %__make all %{?_smp_mflags}
 
-%__make -C po update-gmo
-
 # 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
 
@@ -142,14 +145,6 @@ rm -rf $RPM_BUILD_ROOT
 # man pages are not installed with make install
 %__make mandir=$RPM_BUILD_ROOT%{_mandir} install-man
 
-# fix japanese catalog file
-if [ -d $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC/LC_MESSAGES ]; then
-   mkdir -p $RPM_BUILD_ROOT/%{_datadir}/locale/ja/LC_MESSAGES
-   mv $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC/LC_MESSAGES/*mo \
-		$RPM_BUILD_ROOT/%{_datadir}/locale/ja/LC_MESSAGES
-   rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC
-fi
-
 # let be compatible with old fileutils, sh-utils and textutils packages :
 mkdir -p $RPM_BUILD_ROOT{/bin,%_bindir,%_sbindir,/sbin}
 for f in basename cat chgrp chmod chown cp cut date dd df echo env false \
@@ -177,14 +172,12 @@ for i in hostname uptime kill ; do
 done
 
 %find_lang %name
+# Add the %%lang(xyz) ownership for the LC_TIME dirs as well...
+grep LC_TIME %name.lang | cut -d'/' -f1-6 | sed -e 's/) /) %%dir /g' >>%name.lang
 
 # (sb) Deal with Installed (but unpackaged) file(s) found
 rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 
-# FIXME: remove readlink which conflict with tetex's.
-#rm -f $RPM_BUILD_ROOT%{_bindir}/readlink
-#rm -f $RPM_BUILD_ROOT%{_mandir}/man1/readlink*
-
 
 %check
 # this test will fail on non-real filesystem (overlayfs, etc.).
@@ -196,34 +189,6 @@ make check %{?_smp_mflags}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-# Remove these old glibc files on upgrade (bug #84090).
-for file in $(find /usr/share/locale -type f -name LC_TIME); do
-	[ -x /bin/rm ] && /bin/rm -f "$file"
-done
-
-# We must desinstall theses info files since they're merged in
-# coreutils.info. else their postun'll be runned too last
-# and install-info'll faill badly because of doubles
-for file in sh-utils.info textutils.info fileutils.info; do
-	if [ -f /usr/share/info/$file.bz2 ]; then
-		/sbin/install-info /usr/share/info/$file.bz2 --dir=/usr/share/info/dir --remove &> /dev/null
-	fi
-done
-
-%preun
-if [ $1 = 0 ]; then
-    [ -f %{_infodir}/%{name}.info.gz ] && \
-      /sbin/install-info --delete %{_infodir}/%{name}.info.gz \
-	%{_infodir}/dir || :
-fi
-
-%post
-/bin/grep -v '(sh-utils)\|(fileutils)\|(textutils)' %{_infodir}/dir > \
-  %{_infodir}/dir.rpmmodify || exit 0
-    /bin/mv -f %{_infodir}/dir.rpmmodify %{_infodir}/dir
-[ -f %{_infodir}/%{name}.info.gz ] && \
-  /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -238,8 +203,14 @@ fi
 %{_mandir}/man*/*
 %{_sbindir}/chroot
 
+
 %changelog
-* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.31-1
+* Tue Oct 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.0-1
+- new upstream release.
+- re-imported fedora patches.
+- dropped scriptlets.
+
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.32-1
 - new upstream release.
 - updated all patches.