updated 3 packages

gawk-5.0.1-1

grep-3.4-1

keyutils-1.6-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12336 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gawk/gawk-vl.spec

@@ -1,22 +1,27 @@
 Summary(ja): GNU バージョンの awk テキスト処理ユーティリティー
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
-Version: 4.1.0
+Version: 5.0.1
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
-License: GPL
 Group: Applications/Text
 
-Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
+License: GPL
+URL: https://www.gnu.org/software/gawk/
+Source0: https://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz
 
 Requires(post): /sbin/install-info
 Requires: mktemp
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: byacc
+BuildRequires:    grep
+BuildRequires:    libsigsegv-devel
+BuildRequires:    mpfr-devel
+BuildRequires:    readline-devel
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
 
 %description
 The gawk packages contains the GNU version of awk, a text processing
@@ -39,26 +44,29 @@ gawk パッケージは GNU バージョンの、テキスト処理ユーティ
 %setup -q -n gawk-%{version}
 
 %build
-%configure --bindir=/bin --with-libsigsegv-prefix=no
+%configure --bindir=/bin
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=${RPM_BUILD_ROOT}
+make install DESTDIR=%{buildroot}
 
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+find %{buildroot} -name '*.la' -exec rm -f {} \;
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p %{buildroot}%{_bindir}
-ln -sf gawk.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/awk.1.gz
+ln -sf gawk.1.gz %{buildroot}%{_mandir}/man1/awk.1.gz
-ln -sf ../../bin/gawk $RPM_BUILD_ROOT%{_bindir}/awk
+ln -sf ../../bin/gawk %{buildroot}%{_bindir}/awk
-ln -sf ../../bin/gawk $RPM_BUILD_ROOT%{_bindir}/gawk
+ln -sf ../../bin/gawk %{buildroot}%{_bindir}/gawk
-rm -f $RPM_BUILD_ROOT/bin/{,p}gawk-%{version}
+rm -f %{buildroot}/bin/{,p}gawk-%{version}
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f %{buildroot}%{_infodir}/dir
 
 %find_lang %name
 
+#check
+#make %{?_smp_mflags} check
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 if [ -f %{_infodir}/gawk.info.gz ]; then
@@ -72,7 +80,8 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING FUTURES INSTALL LIMITATIONS NEWS
+%license COPYING
+%doc FUTURES INSTALL LIMITATIONS NEWS
 %doc README_d/README.multibyte README_d/README.tests POSIX.STD
 /bin/*
 %{_bindir}/*
@@ -80,13 +89,19 @@ fi
 %{_mandir}/man3/*
 %{_infodir}/gawk.info*
 %{_infodir}/gawkinet.info*
+%{_infodir}/gawkworkflow.info*
 %{_libexecdir}/awk
 %{_datadir}/awk
 %{_includedir}/gawkapi.h
 %dir %{_libdir}/gawk
 %{_libdir}/gawk/*
+%dir %{_sysconfdir}/profile.d
+%{_sysconfdir}/profile.d/*
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.0.1-1
+- new upstream release.
+
 * Sun May 10 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.1.0-2
 - remove *.la files
 

g/grep/grep-vl.spec

@@ -1,19 +1,23 @@
 Summary: The GNU versions of grep pattern matching utilities.
 Summary(ja): GNU版 grep パターンマッチングユーティリティ
 Name: grep
-Version: 2.22
+Version: 3.4
 Release: 1%{?_dist_release}
+Group: System Environment/Base
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 License: GPLv3+
-Group: System Environment/Base
 URL: http://www.gnu.org/software/grep/
-
+Source: https://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
-Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
 Source1: colorgrep.sh
 Source2: colorgrep.csh
 Source3: GREP_COLORS
-Patch1: grep-2.11-gnulib-tests-rm-f.patch
+# upstream ticket 39444
-Patch2: grep-2.14-man-fix-R.patch
+Patch0: grep-3.33-man-fix-gs.patch
+# upstream ticket 39445
+Patch1: grep-3.33-help-align.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pcre-devel >= 8.31
@@ -22,8 +26,6 @@ BuildRequires: autoconf, automake
 Requires(post): install-info
 Requires(preun): install-info
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
 
 %description
 The GNU versions of commonly used grep utilities.  Grep searches
@@ -44,9 +46,8 @@ utility for searching through text.
 
 %prep
 %setup -q
-%patch1 -p1 -b .gnulib-tests-rm-f
+%patch0 -p1 -b .man-fix-gs
-#patch2 -p1 -b .man-fix-R
+%patch1 -p1 -b .help-align
-
 
 %build
 %configure \
@@ -84,7 +85,8 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS THANKS TODO NEWS README ChangeLog COPYING
+%license COPYING
+%doc AUTHORS THANKS TODO NEWS README ChangeLog
 /bin/*
 %config(noreplace) %{_sysconfdir}/profile.d/colorgrep.*sh
 %config(noreplace) %{_sysconfdir}/GREP_COLORS
@@ -92,6 +94,10 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4-1
+- new upstream release.
+- updated patches.
+
 * Mon Nov 09 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.22-1
 - updated to 2.22
 
@@ -103,7 +109,7 @@ fi
 - update to 2.14
 - build with pcre-8.31
 
-* Tue Feb 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.7-1
+* Thu Feb 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.7-1
 - new upstream release
 - drop unneeded old patches
 - add BR: pcre-devel
@@ -275,7 +281,7 @@ fi
 - update to 2.5
 - change i18n patch
 
-* Sat Jan 20 2002 Ryoichi INAGAKI <ryo1@bc.wakwak.com>
+* Sun Jan 20 2002 Ryoichi INAGAKI <ryo1@bc.wakwak.com>
 - 2.5-0vl1
 - update to 2.5
 - change i18n patch

k/keyutils/keyutils-vl.spec

@@ -1,10 +1,10 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %define vermajor 1
-%define verminor 5.9
+%define verminor 6
 %define version %{vermajor}.%{verminor}
 %define libapivermajor 1
-%define libapiversion %{libapivermajor}.5
+%define libapiversion %{libapivermajor}.6
 
 %define libdir /%{_lib}
 %define usrlibdir %{_prefix}/%{_lib}
@@ -14,19 +14,19 @@ Summary(ja): Linux 鍵管理ユーティリティ
 Name: keyutils
 Version: %{version}
 Release: 1%{?_dist_release}
-License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
-ExclusiveOS: Linux
+License: GPLv2+ and LGPLv2+
-URL: http://people.redhat.com/~dhowells/keyutils/
+Distribution: Vine Linux
+Vendor: Project Vine
 
+URL: http://people.redhat.com/~dhowells/keyutils/
 Source0: http://people.redhat.com/~dhowells/keyutils/keyutils-%{version}.tar.bz2
 
+ExclusiveOS: Linux
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glibc-kernheaders >= 2.4-9.1.92
 Requires: %{name}-libs = %{version}-%{release}
 
-Distribution: Vine Linux
-Vendor: Project Vine
 
 %description
 Utilities to control the kernel key management facility and to provide
@@ -96,6 +96,9 @@ make \
 	SBINDIR=%{_sbindir} \
 	install
 
+mkdir -p %{buildroot}%{_libdir}
+mv -f %{buildroot}/%{_lib}/pkgconfig %{buildroot}%{_libdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -110,7 +113,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENCE.GPL
+%license LICENCE.GPL
+%doc README
 %{_sbindir}/*
 %{_bindir}/*
 %{_datadir}/keyutils
@@ -121,14 +125,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(-,root,root,-)
-%doc LICENCE.LGPL
+%license LICENCE.LGPL
 %{_mandir}/man7/*
-%{libdir}/libkeyutils.so.%{libapiversion}
+%{libdir}/libkeyutils.so.*
-%{libdir}/libkeyutils.so.%{libapivermajor}
 
 %files libs-devel
 %defattr(-,root,root,-)
 %{usrlibdir}/libkeyutils.so
+%{usrlibdir}/pkgconfig/*
 %{_includedir}/*
 %{_mandir}/man3/*
 
@@ -136,15 +140,18 @@ rm -rf $RPM_BUILD_ROOT
 %if %{build_compat32}
 %files -n compat32-%{name}-libs
 %defattr(-,root,root,-)
-%{libdir}/libkeyutils.so.%{libapiversion}
+%{libdir}/libkeyutils.so.*
-%{libdir}/libkeyutils.so.%{libapivermajor}
 
 %files -n compat32-%{name}-libs-devel
 %defattr(-,root,root,-)
 %{usrlibdir}/libkeyutils.so
+%{usrlibdir}/pkgconfig/*
 %endif
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6-1
+- new upstream release.
+
 * Mon Dec 22 2014 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5.9-1
 - updated to 1.5.9
 - rebuilt on current VineSeed
@@ -217,15 +224,15 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jul 20 2005 David Howells <dhowells@redhat.com> - 0.2-2
 - Bump version to permit building in main repositories.
 
-* Mon Jul 12 2005 David Howells <dhowells@redhat.com> - 0.2-1
+* Tue Jul 12 2005 David Howells <dhowells@redhat.com> - 0.2-1
 - Don't attempt to define the error codes in the header file.
 - Pass the release ID through to the makefile to affect the shared library name.
 
-* Mon Jul 12 2005 David Howells <dhowells@redhat.com> - 0.1-3
+* Tue Jul 12 2005 David Howells <dhowells@redhat.com> - 0.1-3
 - Build in the perror() override to get the key error strings displayed.
 
-* Mon Jul 12 2005 David Howells <dhowells@redhat.com> - 0.1-2
+* Tue Jul 12 2005 David Howells <dhowells@redhat.com> - 0.1-2
 - Need a defattr directive after each files directive.
 
-* Mon Jul 12 2005 David Howells <dhowells@redhat.com> - 0.1-1
+* Tue Jul 12 2005 David Howells <dhowells@redhat.com> - 0.1-1
 - Package creation.