Browse Source

updated 3 packages

autoconf-archive-2023.02.20-1

findutils-4.10.0-2

intltool-0.51.0-4
Tomohiro "Tomo-p" KATO 8 months ago
parent
commit
f6be7475a3

+ 8 - 15
a/autoconf-archive/autoconf-archive-vl.spec

@@ -1,19 +1,17 @@
 Summary:        The Autoconf Macro Archive
 Summary(ja):    Autoconfマクロ集
 Name:           autoconf-archive
-Version:        2021.02.19
+Version:        2023.02.20
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        GPLv3+ with exceptions
-URL:            http://www.gnu.org/software/autoconf-archive/
-Source0:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
+URL:            https://www.gnu.org/software/autoconf-archive/
+Source0:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 BuildArch:      noarch
 Requires:       autoconf
-Requires(post): info
-Requires(preun):info
 
 %description
 The GNU Autoconf Archive is a collection of more than 450 macros for
@@ -43,15 +41,6 @@ rm -frv %{buildroot}%{_infodir}/dir
 rm -frv %{buildroot}%{_docdir}/%{name}
 
 
-%post
-install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
-
-%preun
-if [ $1 = 0 ]; then
-  install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
-fi
-
-
 %files
 %doc AUTHORS NEWS README TODO
 %license COPYING*
@@ -60,8 +49,12 @@ fi
 
 
 %changelog
+* Sun Jul 07 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2023.02.20-1
+- new upstream release.
+- dropped install-info scriptlets.
+
 * Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2021.02.19-1
-- ne upstream release.
+- new upstream release.
 
 * Sun Dec 16 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2018.03.13-3
 - initial build for Vine Linux.

+ 14 - 20
f/findutils/findutils-vl.spec

@@ -2,7 +2,7 @@ Summary: The GNU versions of find utilities (find and xargs).
 Summary(ja):  find ユーティリティの GNU バージョン (find および xargs).
 Name: findutils
 Version: 4.10.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: system,accessories
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -31,6 +31,7 @@ Patch6:  findutils-4.9.0-ignore_readdir_race-symlink_loop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool, automake, autoconf
 BuildRequires: dejagnu, gettext, texinfo, git
+Provides: /bin/find
 
 %description
 The findutils package contains programs which will help you locate
@@ -88,43 +89,33 @@ cd build
 make %{?_smp_mflags}
 
 
-%check
-make %{?_smp_mflags} check -C build
-
-
 %install
 %make_install -C build
 
 rm -f %{buildroot}%{_infodir}/dir
 
-# move find to /bin
-mkdir -p %{buildroot}/bin
-mv %{buildroot}%{_bindir}/find %{buildroot}/bin/
-ln -sf ../../bin/find %{buildroot}%{_bindir}
-
 %find_lang %{name}
 
 
+%check
+make %{?_smp_mflags} check -C build
+
+
 %post
-if [ -f %{_infodir}/find.info.gz ]; then
-  /sbin/install-info %{_infodir}/find.info.gz %{_infodir}/dir
+if [ ! -L /bin -a ! -e /bin/find ]; then
+  ln -sf ../usr/bin/find /bin/
 fi
 
-%preun
-if [ $1 = 0 -a -f %{_infodir}/find.info.gz ]; then
-    /sbin/install-info --delete %{_infodir}/find.info.gz %{_infodir}/dir
+%triggerpostun -- findutils < 5.3.0-2
+if [ ! -L /bin -a ! -e /bin/find ]; then
+  ln -sf ../usr/bin/find /bin/
 fi
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
 %defattr(-,root,root)
 %license COPYING
 %doc AUTHORS NEWS README THANKS TODO
-/bin/find
 %{_bindir}/find
 %{_bindir}/xargs
 %{_mandir}/man1/find.1*
@@ -134,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 07 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.10.0-2
+- prepared for usrmerge.
+
 * Mon Jun 17 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.10.0-1
 - new upstream release.
 

+ 6 - 7
i/intltool/intltool-vl.spec

@@ -2,7 +2,7 @@ Name: intltool
 Summary: Utility for internationalizing various kinds of data files.
 Summary(ja): さまざまな種類のファイルを国際化するためのユーティリティ
 Version: 0.51.0
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -42,17 +42,13 @@ them in the po files.
 
 %build
 %configure
-make
+%make_build
 
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
-
-
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%make_install
 
 
 %files
@@ -66,6 +62,9 @@ make
 
 
 %changelog
+* Sun Jul 07 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.51.0-4
+- rebuilt with current environment.
+
 * Tue Nov 16 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.51.0-3
 - rebuilt with perl-5.34.0.