Browse Source

updated 4 packages

autoconf-2.72-1

coreutils-9.5-2

gawk-5.3.0-2

gettext-0.22.5-2
Tomohiro "Tomo-p" KATO 8 months ago
parent
commit
4fe6c56983
4 changed files with 110 additions and 71 deletions
  1. 6 19
      a/autoconf/autoconf-vl.spec
  2. 65 36
      c/coreutils/coreutils-vl.spec
  3. 24 7
      g/gawk/gawk-vl.spec
  4. 15 9
      g/gettext/gettext-vl.spec

+ 6 - 19
a/autoconf/autoconf-vl.spec

@@ -6,17 +6,15 @@
 Summary: A GNU tool for automatically configuring source code.
 Summary(ja): ソースコードを自動的に設定するための GNU ツール
 Name: autoconf
-Version: 2.71
+Version: 2.72
 Release: 1%{?_dist_release}
 Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
 
 License: GPL
-URL: http://www.gnu.org/software/autoconf/
-
-Source: http://ftp.gnu.org/pub/gnu/autoconf/autoconf-%{version}.tar.xz
-Patch2: autoconf-test38.patch
+URL: https://www.gnu.org/software/autoconf/
+Source: https://ftp.gnu.org/pub/gnu/autoconf/autoconf-%{version}.tar.xz
 
 # Vine Source(s)
 Source10: autoconf-mode-install.sh
@@ -74,7 +72,6 @@ Emacs-lisp autoconf-mode for autoconf/autotest
 
 %prep
 %setup -q -n autoconf-%{version}
-%patch2 -p1
 
 
 %build
@@ -122,13 +119,6 @@ make check %{?_smp_mflags}
 %endif
 
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-
-%post
-/sbin/install-info %{_infodir}/autoconf.info.gz %{_infodir}/dir
-
 %post mode
 if [ "$1" = 2 ]; then
 %_emacsenPackageRemove autoconf-mode
@@ -136,12 +126,6 @@ fi
 %_addemacsenlist autoconf-mode
 %_emacsenPackageInstall autoconf-mode
 
-%preun
-if [ "$1" = 0 ]; then
-    /sbin/install-info --del %{_infodir}/autoconf.info.gz %{_infodir}/dir
-fi
-
-
 %preun mode
 if [ "$1" = 0 ]; then
 %_emacsenPackageRemove autoconf-mode
@@ -167,6 +151,9 @@ fi
 
 
 %changelog
+* Sun Jul 07 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.72-1
+- updated to 2.72.
+
 * Wed Feb 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.71-1
 - updated to 2.71.
 - dropped Patch1 and 3: fixed in upstream.

+ 65 - 36
c/coreutils/coreutils-vl.spec

@@ -1,36 +1,38 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Summary(ja): GNU コアユーティリティ: シェルスクリプトで用いるツール集
-Name:    coreutils
-Version: 9.5
-Release: 1%{?_dist_release}
-License: GPL
-Group:   system
-Url:     https://www.gnu.org/software/coreutils/
-
-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
-Source105:  coreutils-colorls.sh
-Source106:  coreutils-colorls.csh
+Name:           coreutils
+Version:        9.5
+Release:        2%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPL
+URL:            https://www.gnu.org/software/coreutils/
+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
+Source105:      coreutils-colorls.sh
+Source106:      coreutils-colorls.csh
 
 # Vine sources
-Source1000: coreutils-8.10-ja.po
+Source1000:     coreutils-8.10-ja.po
 
 # disable the test-lock gnulib test prone to deadlock
-Patch100: coreutils-8.26-test-lock.patch
+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
 
 #df --direct
-Patch104: coreutils-df-direct.patch
+Patch104:       coreutils-df-direct.patch
 
 # (sb) lin18nux/lsb compliance - multibyte functionality patch
-Patch800: coreutils-i18n.patch
+Patch800:       coreutils-i18n.patch
 
 #SELINUX Patch - implements Redhat changes
 #(upstream did some SELinux implementation unlike with RedHat patch)
@@ -40,21 +42,30 @@ Patch800: coreutils-i18n.patch
 %global __requires_exclude ^%{_bindir}/coreutils$
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires:	gettext libtermcap-devel bison
-BuildRequires: texinfo >= 4.3
-BuildRequires: autoconf >= 2.58, automake >= 1.11.2
-BuildRequires: libcap-devel
-BuildRequires: libattr-devel
-BuildRequires: libacl-devel
-BuildRequires: gmp-devel
+BuildRequires:  gettext libtermcap-devel bison
+BuildRequires:  texinfo >= 4.3
+BuildRequires:  autoconf >= 2.58, automake >= 1.11.2
+BuildRequires:  libcap-devel
+BuildRequires:  libattr-devel
+BuildRequires:  libacl-devel
+BuildRequires:  gmp-devel
 
 # Require a C library that doesn't put LC_TIME files in our way.
-Conflicts: glibc < 2.2
-
-Provides:	fileutils = %version, sh-utils = %version, stat, textutils = %version
-Obsoletes:	fileutils sh-utils stat textutils
-Provides:	mktemp = %version
-Obsoletes:	mktemp
+Conflicts:      glibc < 2.2
+
+Provides:       /usr/bin/cut
+Provides:       /usr/bin/env
+
+Provides:       fileutils = %{version}-%{release}
+Obsoletes:      fileutils < %{version}-%{release}
+Provides:       sh-utils = %{version}-%{release}
+Obsoletes:      sh-utils < %{version}-%{release}
+Provides:       stat = %{version}-%{release}
+Obsoletes:      stat < %{version}-%{release}
+Provides:       textutils = %{version}-%{release}
+Obsoletes:      textutils < %{version}-%{release}
+Provides:       mktemp = %{version}-%{release}
+Obsoletes:      mktemp < %{version}-%{release}
 
 %description
 These are the GNU core utilities.  This package is the combination of
@@ -142,8 +153,6 @@ done
 
 # chroot was in /usr/sbin :
 mv $RPM_BUILD_ROOT/{%_bindir,%_sbindir}/chroot
-# {cat,sort,cut} were previously moved from bin to /usr/bin and linked into 
-for i in env cut; do ln -sf ../../bin/$i $RPM_BUILD_ROOT/usr/bin; done
 
 mkdir -p $RPM_BUILD_ROOT/etc/profile.d
 install -p -c -m644 %SOURCE101 $RPM_BUILD_ROOT%{_sysconfdir}/DIR_COLORS
@@ -165,15 +174,32 @@ grep LC_TIME %name.lang | cut -d'/' -f1-6 | sed -e 's/) /) %%dir /g' >>%name.lan
 rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 
 
+%ifarch x86_64
 %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}
+%endif
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post
+if [ ! -L /bin ]; then
+  for i in env cut; do
+    if [ ! -e /usr/bin/$i ]; then
+      ln -sf ../../bin/$i /usr/bin/$i
+    fi
+  done
+fi
+
+%triggerpostun -- coreutils < 9.5-2
+if [ ! -L /bin ]; then
+  for i in env cut; do
+    if [ ! -e /usr/bin/$i ]; then
+      ln -sf ../../bin/$i /usr/bin/$i
+    fi
+  done
+fi
 
 
 %files -f %{name}.lang
@@ -191,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 07 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.5-2
+- prepared for usrmerge.
+
 * Mon Jun 17 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.5-1
 - new upstream release.
 

+ 24 - 7
g/gawk/gawk-vl.spec

@@ -2,7 +2,7 @@ Summary(ja): GNU バージョンの awk テキスト処理ユーティリティ
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 5.3.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: system,accessories
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -13,8 +13,10 @@ URL: https://www.gnu.org/software/gawk/
 Source0: https://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz
 
 Requires: mktemp
+Provides: /usr/bin/awk
+Provides: /usr/bin/gawk
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    grep
 BuildRequires:    libsigsegv-devel
 BuildRequires:    mpfr-devel
@@ -57,8 +59,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} \;
 
 mkdir -p %{buildroot}%{_bindir}
 ln -sf gawk.1.gz %{buildroot}%{_mandir}/man1/awk.1.gz
-ln -sf ../../bin/gawk %{buildroot}%{_bindir}/awk
-ln -sf ../../bin/gawk %{buildroot}%{_bindir}/gawk
 rm -f %{buildroot}/bin/{,p}gawk-%{version}
 rm -f %{buildroot}%{_infodir}/dir
 
@@ -69,8 +69,23 @@ rm -f %{buildroot}%{_infodir}/dir
 #make %{?_smp_mflags} check
 
 
-%clean
-rm -rf %{buildroot}
+%post
+if [ ! -L /bin ]; then
+  for i in awk gawk; do
+    if [ ! -e /usr/bin/$i ]; then
+      ln -sf ../../bin/gawk /usr/bin/$i;
+    fi
+  done
+fi
+
+%triggerpostun -- gawk < 5.3.0-2
+if [ ! -L /bin ]; then
+  for i in awk gawk; do
+    if [ ! -e /usr/bin/$i ]; then
+      ln -sf ../../bin/gawk /usr/bin/$i;
+    fi
+  done
+fi
 
 
 %files -f %{name}.lang
@@ -79,7 +94,6 @@ rm -rf %{buildroot}
 %doc FUTURES INSTALL LIMITATIONS NEWS
 %doc README_d/README.multibyte README_d/README.tests POSIX.STD
 /bin/*
-%{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_infodir}/*awk*.*
@@ -93,6 +107,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jul 07 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.3.0-2
+- prepared for usrmerge.
+
 * Mon Jun 17 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.3.0-1
 - new upstream release.
 

+ 15 - 9
g/gettext/gettext-vl.spec

@@ -8,7 +8,7 @@ Summary: GNU libraries and utilities for producing multi-lingual messages.
 Summary(ja): マルチリンガルメッセージを生成するためのGNU ライブラリ/ユーティリティ
 Name: gettext
 Version: %{src_ver}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: programming
 Packager: daisuke
 Vendor: Project Vine
@@ -24,7 +24,7 @@ Patch2: %{name}-0.21.1-covscan.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: libtool, bison, gcc-c++
+BuildRequires: autoconf, libtool, bison, gcc-c++
 # following suggested by DEPENDENCIES:
 BuildRequires: ncurses-devel
 BuildRequires: libxml2-devel
@@ -33,7 +33,7 @@ BuildRequires: libacl-devel
 BuildRequires: libunistring-devel
 # ensure 'ARCHIVE_FORMAT=dirxz'
 BuildRequires: xz
-
+Provides: /bin/gettext
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -149,9 +149,6 @@ rm -rf $RPM_BUILD_ROOT
 # delete po-mode
 %{__rm} -rf %{buildroot}/usr/share/emacs/site-lisp
 
-mkdir -p %{buildroot}/bin
-mv %{buildroot}/%{_bindir}/gettext %{buildroot}/bin
-ln -s ../../bin/gettext %{buildroot}/%{_bindir}/gettext
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/msghack
 install -pm 644 %SOURCE3 ${RPM_BUILD_ROOT}/%{_mandir}/man1/msghack.1
 
@@ -171,8 +168,15 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
 %__rm -rf %{buildroot}%{_docdir}/%{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post
+if [ ! -L /bin -a ! -e /bin/gettext ]; then
+  ln -sf ../usr/bin/gettext /bin/
+fi
+
+%triggerpostun -- gettext < 0.22.5-2
+if [ ! -L /bin -a ! -e /bin/gettext ]; then
+  ln -sf ../usr/bin/gettext /bin/
+fi
 
 
 %files -f gettext.lang
@@ -183,7 +187,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS THANKS 
 %doc gettext-runtime/man/*.1.html
 %doc gettext-runtime/intl/COPYING*
-/bin/*
 %{_bindir}/*
 %{_libdir}/libgettextlib-%{so_ver}.so
 %{_libdir}/libgettextsrc-%{so_ver}.so
@@ -223,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 07 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.22.5-2
+- prepared for usrmerge.
+
 * Mon Jun 17 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.22.5-1
 - new upstream release.