updated 6 packages

gnutls-3.6.15-2

grub2-2.04-4

kernel-5.4.66-1

libX11-1.6.12-1

perl-DBI-1.643-1

rsyslog-8.2008.0-2

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

g/gnutls/gnutls-vl.spec

@@ -7,7 +7,7 @@ Summary:	GNU TLS Library
 Summary(ja):	GNU TLS ライブラリ
 Name:		gnutls
 Version:	3.6.15
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Group:		system
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -56,11 +56,23 @@ the proposed standards by the IETF's TLS working group.
 #'
 
 
+%package dane
+Summary:	A DANE protocol implementation for GnuTLS
+Summary(ja):	GnuTLSのDANE実装
+Group:		system
+Requires:	%{name} = %{version}-%{release}
+
+%description dane
+This package contains a part of GnuTLS library that implements the DANE
+protocol for verifying TLS certificates through DNSSEC.
+
+
 %package devel
 Summary:	Development files for the GnuTLS package.
-Summary(ja):	GnuTLS の開発用ファイル
+Summary(ja):	GnuTLSの開発用ファイル
 Group:		programming
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-dane = %{version}-%{release}
 Requires:	libgcrypt-devel, zlib-devel, pkgconfig
 Requires:	libtasn1-devel, nettle-devel
 Provides:	pkgconfig(gnutls) = %{version}
@@ -253,10 +265,12 @@ fi
 %files -f gnutls.lang
 %defattr(-,root,root,-)
 %{_libdir}/libgnutls.so.30*
-%{_libdir}/libgnutls-dane.so.*
 # %{_libdir}/libgnutls-xssl.so.0*
 %doc README* AUTHORS NEWS THANKS
 
+%files dane
+%{_libdir}/libgnutls-dane.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
@@ -310,6 +324,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.15-2
+- added a subpackage: gnutls-dane.
+
 * Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.15-1
 - new upstream release.
 

g/grub2/grub2-vl.spec

@@ -13,9 +13,9 @@
 
 Name:           grub2
 Version:        2.04
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        Bootloader with support for Linux, Multiboot and more
-Group:          System Environment/Base
+Group:          system
 License:        GPLv3+
 URL:            https://www.gnu.org/software/grub/
 Vendor:         Project Vine
@@ -87,18 +87,20 @@ hardware devices.\
 %description
 %{desc}
 
+
 %package common
 Summary:	grub2 common layout
-Group:		System Environment/Base
+Group:		system
 BuildArch:	noarch
 
 %description common
 This package provides some directories which are required by various grub2
 subpackages.
 
+
 %package tools
 Summary:	Support tools for GRUB.
-Group:		System Environment/Base
+Group:		admin-tools
 Obsoletes:	%{name}-tools < %{evr}
 Requires:	%{name}-common = %{evr}
 Requires:	gettext os-prober which file
@@ -112,7 +114,7 @@ This subpackage provides tools for support of all platforms.
 %ifarch x86_64
 %package tools-efi
 Summary:	Support tools for GRUB.
-Group:		System Environment/Base
+Group:		admin-tools
 Requires:	gettext os-prober which file
 Requires:	%{name}-common = %{evr}
 Obsoletes:	%{name}-tools < %{evr}
@@ -124,7 +126,7 @@ This subpackage provides tools for support of EFI platforms.
 
 %package tools-minimal
 Summary:	Support tools for GRUB.
-Group:		System Environment/Base
+Group:		admin-tools
 Requires:	gettext
 Requires:	%{name}-common = %{evr}
 Obsoletes:	%{name}-tools < %{evr}
@@ -135,7 +137,7 @@ This subpackage provides tools for support of all platforms.
 
 %package tools-extra
 Summary:	Support tools for GRUB.
-Group:		System Environment/Base
+Group:		admin-tools
 Requires:	gettext os-prober which file console-setup
 Requires:	%{name}-tools-minimal = %{evr}
 Requires:	%{name}-common = %{evr}
@@ -145,6 +147,7 @@ Obsoletes:	%{name}-tools < %{evr}
 %{desc}
 This subpackage provides tools for support of all platforms.
 
+
 %if 0%{with_efi_arch}
 %{expand:%define_efi_variant %%{package_arch} -o}
 %endif
@@ -155,17 +158,21 @@ This subpackage provides tools for support of all platforms.
 %{expand:%define_legacy_variant %%{legacy_package_arch}}
 %endif
 
+
 %if 0%{with_emu_arch}
 %package emu
 Summary:	GRUB user-space emulation.
+Group:		system
 Requires:	%{name}-tools-minimal = %{evr}
 
 %description emu
 %{desc}
 This subpackage provides the GRUB user-space emulation support of all platforms.
 
+
 %package emu-modules
 Summary:	GRUB user-space emulation modules.
+Group:		system
 Requires:	%{name}-tools-minimal = %{evr}
 
 %description emu-modules
@@ -173,18 +180,20 @@ Requires:	%{name}-tools-minimal = %{evr}
 This subpackage provides the GRUB user-space emulation modules.
 %endif
 
+
 %package theme-starfield
 Summary:	Starfield theme for GRUB2
-Group:		System Environment/Base
+Group:		system
 Requires:	%{name}-common = %{version}-%{release}
 
 %description theme-starfield
 %{desc}
 This subpackage provides Starfield theme.
 
+
 %package theme-vine
 Summary:	Vine Linux theme for GRUB2
-Group:		System Environment/Base
+Group:		system
 Requires:	%{name}-common = %{version}-%{release}
 
 %description theme-vine
@@ -192,6 +201,9 @@ Requires:	%{name}-common = %{version}-%{release}
 This package provides Vine Linux theme.
 
 
+%debug_package
+
+
 %prep
 %do_common_setup
 
@@ -226,6 +238,7 @@ git add grub-emu-%{tarversion}
 %endif
 git commit -m "After making subdirs"
 
+
 %build
 sed -i \
 	-e 's,-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 ,,g' \
@@ -234,6 +247,10 @@ sed -i \
 	grub-core/lib/gnulib/Makefile.in \
 	grub-core/lib/gnulib/Makefile.am
 
+sed -i \
+	-e 's|systemdunitdir = .*$|systemdunitdir = %{_unitdir}|' \
+	conf/Makefile.common
+
 %if 0%{with_efi_arch}
 %{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags}}
 %endif
@@ -255,6 +272,7 @@ makeinfo --html --no-split -I docs -o docs/grub-dev.html \
 makeinfo --html --no-split -I docs -o docs/grub.html \
 	docs/grub.texi
 
+
 %install
 set -e
 rm -fr $RPM_BUILD_ROOT
@@ -301,8 +319,8 @@ install -d -m 0755 %{buildroot}%{_prefix}/lib/kernel/install.d/
 install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE10}
 install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE3}
 install -d -m 0755 %{buildroot}%{_sysconfdir}/kernel/install.d/
-# Install systemd user service to set the boot_success flag
 %if %{with systemd}
+# Install systemd user service to set the boot_success flag
 install -D -m 0755 -t %{buildroot}%{_userunitdir} \
 	docs/grub-boot-success.{timer,service}
 install -d -m 0755 %{buildroot}%{_userunitdir}/timers.target.wants
@@ -311,8 +329,14 @@ ln -s ../grub-boot-success.timer \
 # Install systemd system-update unit to set boot_indeterminate for offline-upd
 install -D -m 0755 -t %{buildroot}%{_unitdir} docs/grub-boot-indeterminate.service
 install -d -m 0755 %{buildroot}%{_unitdir}/system-update.target.wants
+install -d -m 0755 %{buildroot}%{_unitdir}/reboot.target.wants
 ln -s ../grub-boot-indeterminate.service \
 	%{buildroot}%{_unitdir}/system-update.target.wants
+ln -s ../grub2-systemd-integration.service \
+	%{buildroot}%{_unitdir}/reboot.target.wants
+%else
+rm -rf %{buildroot}%{_unitdir}
+rm -rf %{buildroot}%{_libexecdir}/grub2
 %endif
 
 # Don't run debuginfo on all the grub modules and whatnot; it just
@@ -361,6 +385,7 @@ popd
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre tools
 if [ -f /boot/grub2/user.cfg ]; then
     if grep -q '^GRUB_PASSWORD=' /boot/grub2/user.cfg ; then
@@ -418,7 +443,9 @@ fi
 %dir /boot/%{name}/themes/
 %dir /boot/%{name}/themes/system
 %dir %attr(0700,root,root) %{efi_esp_dir}
+%ifnarch %{ix86}
 %exclude %{efi_esp_dir}/*
+%endif
 %license COPYING
 %ghost %config(noreplace) /boot/grub2/grubenv
 %doc INSTALL
@@ -458,11 +485,6 @@ fi
 %files tools
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/default/grub
 %config %{_sysconfdir}/grub.d/??_*
-%ifarch ppc64 ppc64le
-%exclude %{_sysconfdir}/grub.d/10_linux
-%else
-%exclude %{_sysconfdir}/grub.d/10_linux_bls
-%endif
 %{_sysconfdir}/grub.d/README
 %if %{with systemd}
 %{_userunitdir}/grub-boot-success.timer
@@ -470,6 +492,11 @@ fi
 %{_userunitdir}/timers.target.wants
 %{_unitdir}/grub-boot-indeterminate.service
 %{_unitdir}/system-update.target.wants
+%{_unitdir}/grub2-systemd-integration.service
+%{_unitdir}/reboot.target.wants
+%{_unitdir}/systemd-logind.service.d
+%dir %{_libexecdir}/grub2
+%{_libexecdir}/grub2/systemd-integration.sh
 %endif
 %{_infodir}/%{name}*
 %{_datarootdir}/grub/*
@@ -514,7 +541,6 @@ fi
 %ifarch x86_64
 %{_sbindir}/%{name}-bios-setup
 %else
-%exclude %{_sbindir}/%{name}-bios-setup
 %exclude %{_datadir}/man/man8/%{name}-bios-setup*
 %endif
 %ifarch %{sparc}
@@ -588,7 +614,9 @@ fi
 %defattr(-,root,root)
 %{_datarootdir}/grub/themes/vine
 
+
 %changelog
+* Wed Sep 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.04-4
 * Tue Jul 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.04-3
 - imported Patch206-222 from rawhide.
 - updated ja.po.

k/kernel/kernel-vl.spec

@@ -40,7 +40,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # adding some text to the end of the version number.
 #
 %define sublevel 4
-%define patchlevel 61
+%define patchlevel 66
 %define kversion 5.%{sublevel}
 %define rpmversion 5.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -261,7 +261,7 @@ kernel パッケージには、Linux オペレーティングシステムの心
 %package devel
 Summary: Development package for building kernel modules to match the kernel.
 Summary(ja): 特定のバージョンのカーネル用のモジュールを構築するための開発パッケージ
-Group: system
+Group: programming
 AutoReqProv: no
 Provides: kernel26-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Requires: elfutils-libelf-devel
@@ -410,7 +410,7 @@ Install the kernel-pae package if your machine has more than 4GB of memory.
 %package pae-devel
 Summary: Development package for building kernel modules to match the PAE capable kernel.
 Summary(ja): 特定のバージョンのPAE対応カーネル用のモジュールを構築するための開発パッケージ
-Group: system
+Group: programming
 Provides: kernel-pae-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}pae
 Provides: kernel-devel = %{rpmversion}-%{release}pae
@@ -440,7 +440,7 @@ and the supporting documentation.
 
 %package -n kernel-tools-libs
 Summary: Libraries for the kernels-tools
-Group: programming
+Group: system
 License: GPLv2
 
 %description -n kernel-tools-libs
@@ -1160,6 +1160,9 @@ fi
 
 
 %changelog
+* Sat Sep 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.66-1
+- updated to 5.4.66.
+
 * Tue Sep 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.61-1
 - updated to 5.4.61.
 

lib/libX/libX11/libX11-vl.spec

@@ -3,7 +3,7 @@
 Summary:        X.Org X11 libX11 runtime library
 Summary(ja):    X.Org X11 libX11 ランタイムライブラリ
 Name:           libX11
-Version:        1.6.11
+Version:        1.6.12
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
@@ -34,6 +34,7 @@ Obsoletes:      XFree86-libs, XOrg-libs
 %description
 X.Org X11 libX11 runtime library
 
+
 %package devel
 Summary: X.Org X11 libX11 development package
 Summary(ja): X.Org X11 libX11 開発パッケージ
@@ -48,6 +49,7 @@ Obsoletes: XFree86-devel, XOrg-devel
 %description devel
 X.Org X11 libX11 development package
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: X.Org X11 libX11 runtime library
@@ -57,6 +59,7 @@ Group: system
 %description -n compat32-%{name}
 X.Org X11 libX11 runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libX11 development package
 Summary(ja): X.Org X11 libX11 開発パッケージ
@@ -69,6 +72,10 @@ Requires: compat32-libXau-devel, compat32-libXdmcp-devel, compat32-libxcb-devel
 %description -n compat32-%{name}-devel
 X.Org X11 libX11 development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 # FIXME: We are keeping this around, as upstream has a tendency for random
@@ -319,6 +326,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Sep 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.12-1
+- new upstream release.
+
 * Fri Aug 07 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.11-1
 - new upstream release.
 

p/perl-DBI/perl-DBI-vl.spec

@@ -1,19 +1,16 @@
-%define version 1.642
-%define release 1
-
-Summary: A database access API for perl
-Summary(ja): perl 用データベース接続 API
-Name: perl-DBI
-Version: %{version}
-Release: %{release}%{?_dist_release}
-License: GPL or Artistic
-Group: Development/Libraries
-URL:            http://dbi.perl.org/
-Source0:        http://www.cpan.org/authors/id/T/TI/TIMB/DBI-%{version}.tar.gz
-
+Summary:        A database access API for perl
+Summary(ja):    perl 用データベース接続 API
+Name:           perl-DBI
+Version:        1.643
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
+License:        GPL or Artistic
+URL:            https://dbi.perl.org/
+Source0:        https://cpan.metacpan.org/authors/id/T/TI/TIMB/DBI-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libxcrypt-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -68,7 +65,6 @@ BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Math::BigInt)
 
-
 %description 
 DBI is a database access Application Programming Interface (API) for
 the Perl Language. The DBI API Specification defines a set of
@@ -81,6 +77,9 @@ DBI API では，実際に使われるデータベースに依存しない様に
 関数，変数などの取り決めが定義されています．
 
 
+%debug_package
+
+
 %prep
 %setup -q -n DBI-%{version} 
 iconv -f iso8859-1 -t utf-8 lib/DBD/Gofer.pm >lib/DBD/Gofer.pm.new &&
@@ -94,6 +93,7 @@ sed -i 's?#!perl?#!%{__perl}?' ex/corogofer.pl
 perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
+
 %install
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
@@ -107,12 +107,15 @@ rm -rf %{buildroot}%{perl_vendorarch}/{Win32,DBI/W32ODBC.pm} \
 perl -pi -e 's"#!perl -w"#!/usr/bin/perl -w"' \
     %{buildroot}%{perl_vendorarch}/{goferperf,dbixs_rev}.pl
 
-%clean
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
 %check
 make test
 
+
+%clean
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
+
 %files 
 %defattr(-,root,root)
 %doc Changes README.md  ex/
@@ -124,7 +127,11 @@ make test
 %{_bindir}/*
 %{_mandir}/*/*
 
+
 %changelog
+* Sat Sep 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.643-1
+- updated to 1.642.
+
 * Wed May 15 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.642-1
 - updated to 1.642.
 - rebuilt with perl-5.26.

r/rsyslog/rsyslog-vl.spec

@@ -7,7 +7,7 @@
 Summary:        Enhanced system logging and kernel message trapping daemon
 Name:           rsyslog
 Version:        8.2008.0
-Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Release:        2%{?_dist_release}%{?with_systemd:.systemd}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -304,6 +304,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2008.0-2
+- fixed systemd-unit.
+
 * Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2008.0-1
 - new upstream release.
 - dropped Patch0: merged into upstream.