updated 4 packages

cronie-1.5.5-2

geoclue2-2.5.6-1

kernel-5.4.57-1

rng-tools-6.10-5

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

c/cronie/cronie-vl.spec

@@ -1,3 +1,4 @@
+%bcond_with systemd
 %bcond_with selinux
 %bcond_without pam
 %bcond_without audit
@@ -6,11 +7,12 @@
 Summary:        Cron daemon for executing programs at set times
 Name:           cronie
 Version:        1.5.5
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}%{?with_systemd:.systemd}
-Group:          System Environment/Base
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Packager:       iwaim
+
 License:        MIT and BSD and ISC and GPLv2+
 URL:            https://github.com/cronie-crond/cronie
 Source0:        https://github.com/cronie-crond/cronie/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -31,10 +33,15 @@ BuildRequires:  pam-devel >= 1.0.1
 %if %{with audit}
 BuildRequires:  audit-libs-devel >= 1.4.1
 %endif
-
+%if %{with systemd}
-Requires(post): coreutils sed
+BuildRequires:  systemd
+%{?systemd_requires}
+%else
 Requires(post): chkconfig
 Requires(preun): chkconfig
+%endif
+
+Requires(post): coreutils sed
 
 Obsoletes:      vixie-cron <= 3.0.1
 
@@ -44,10 +51,11 @@ scheduled times and related tools. It is a fork of the original vixie-cron and
 has security and configuration enhancements like the ability to use pam and
 SELinux.
 
+
 %package anacron
 Summary:   Utility for running regular jobs
 Requires:  crontabs
-Group:     System Environment/Base
+Group:     system
 Provides:  dailyjobs
 Provides:  anacron = 2.4
 Obsoletes: anacron <= 2.3
@@ -65,9 +73,10 @@ Using anacron allows running the periodic jobs even if the system is often
 powered off and it also allows randomizing the time of the job execution
 for better utilization of resources shared among multiple systems.
 
+
 %package noanacron
 Summary:   Utility for running simple regular jobs in old cron style
-Group:     System Environment/Base
+Group:     system
 Provides:  dailyjobs
 Requires:  crontabs
 Requires:  %{name} = %{version}-%{release}
@@ -76,6 +85,7 @@ Requires:  %{name} = %{version}-%{release}
 Old style of running {hourly,daily,weekly,monthly}.jobs without anacron. No
 extra features.
 
+
 %prep
 %setup -q
 
@@ -100,6 +110,7 @@ extra features.
 
 make %{?_smp_mflags}
 
+
 %install
 make install DESTDIR=$RPM_BUILD_ROOT DESTMAN=$RPM_BUILD_ROOT%{_mandir}
 mkdir -pm700 $RPM_BUILD_ROOT%{_localstatedir}/spool/cron
@@ -122,13 +133,25 @@ touch $RPM_BUILD_ROOT/var/spool/anacron/cron.monthly
 # noanacron package
 install -m 644 contrib/dailyjobs $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/dailyjobs
 
+
+%if %{with systemd}
+# install systemd initscript
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+install -m 644 contrib/cronie.systemd $RPM_BUILD_ROOT%{_unitdir}/crond.service
+%else
 # install initscript
 mkdir -p $RPM_BUILD_ROOT%{_initddir}
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/crond
+%endif
+
 
 %post
 # run after an installation
+%if %{with systemd}
+%systemd_post crond.service
+%else
 /sbin/chkconfig --add crond
+%endif
 
 %post anacron
 [ -e /var/spool/anacron/cron.daily ] || touch /var/spool/anacron/cron.daily
@@ -137,19 +160,32 @@ install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/crond
 
 %preun
 # run before a package is removed
-if [ "$1" -eq 0 ]; then
+%if %{with systemd}
+%systemd_preun crond.service
+%else
+if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
         /sbin/service crond stop >/dev/null 2>&1
         /sbin/chkconfig --del crond
 fi
+%endif
 
 %postun
 # run after a package is removed
+%if %{with systemd}
+%systemd_postun_with_restart crond.service
+%else
 if [ "$1" -ge "1" ]; then
   /sbin/service crond condrestart >/dev/null 2>&1 || :
 fi
+%endif
 
 %triggerpostun -- vixie-cron
+%if %{with systemd}
+%systemd_postun_with_restart crond.service
+%else
 /sbin/chkconfig --add crond
+%endif
+
 
 %files
 %license COPYING*
@@ -170,7 +206,11 @@ fi
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/crond
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/cron.deny
 %attr(0644,root,root) %{_sysconfdir}/cron.d/0hourly
+%if %{with systemd}
+%{_unitdir}/crond.service
+%else
 %attr(0755,root,root) %{_initddir}/crond
+%endif
 
 %files anacron
 %{_sbindir}/anacron
@@ -186,7 +226,11 @@ fi
 %files noanacron
 %attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs
 
+
 %changelog
+* Sun Aug 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.5-2
+- added systemd support (disabled as default).
+
 * Wed Mar 25 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.5-1
 - new upstream release.
 - dropped all patches.

g/geoclue2/geoclue2-vl.spec

@@ -1,13 +1,16 @@
+%bcond_with systemd
+
 Summary:        A modular geoinformation service
 Summary(ja):    モジュール型地理情報サービス
-
 Name:           geoclue2
-Version:        2.5.3
+Version:        2.5.6
-Release:        1%{?_dist_release}
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Group:          System Environment/Libraries
 License:        GPLv2+
-URL:            http://www.freedesktop.org/wiki/Software/GeoClue/
+URL:            https://www.freedesktop.org/wiki/Software/GeoClue/
 Source0:        https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/%{version}/geoclue-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -24,9 +27,9 @@ BuildRequires: vala-devel
 BuildRequires: gtk-doc
 BuildRequires: itstool
 BuildRequires: meson
-
+%if %{with systemd}
-Vendor: Project Vine
+%{?systemd_requires}
-Distribution: Vine Linux
+%endif
 
 %description
 Geoclue is a modular geoinformation service built on top of the D-Bus 
@@ -36,7 +39,7 @@ location-aware applications as simple as possible.
 %package devel
 Summary: Development package for geoclue
 Summary(ja): geoclue の開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -47,19 +50,59 @@ Files for development with geoclue.
 %prep
 %setup -q -n geoclue-%{version}
 
+
 %build
-%meson -Dgtk-doc=false -Ddemo-agent=false
+%meson \
+	-Ddbus-srv-user=geoclue \
+	-Dgtk-doc=false \
+	-Ddemo-agent=false \
+%if %{with systemd}
+	-Dsystemd-system-unit-dir=%{_unitdir} \
+%endif
+	%{nil}
 %meson_build
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %meson_install
-#find %{buildroot} -name '*.la' -exec rm -f {} ';'
+# Home directory for the 'geoclue' user
+mkdir -p $RPM_BUILD_ROOT/var/lib/geoclue
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%pre
+# Update the home directory for existing users
+getent passwd geoclue >/dev/null && \
+    usermod -d /var/lib/geoclue geoclue &>/dev/null
+# Create a new user and group if they don't exist
+getent group geoclue >/dev/null || groupadd -r geoclue
+getent passwd geoclue >/dev/null || \
+    useradd -r -g geoclue -d /var/lib/geoclue -s /sbin/nologin \
+    -c "User for geoclue" geoclue
+exit 0
+
+
+%post
+/sbin/ldconfig
+%if %{with systemd}
+%systemd_post geoclue.service
+%endif
+
+%if %{with systemd}
+%preun
+%systemd_preun geoclue.service
+%endif
+
+%postun
+/sbin/ldconfig
+%if %{with systemd}
+%systemd_postun_with_restart geoclue.service
+%endif
+
+
 %files
 %defattr(-,root,root,-)
 %license COPYING
@@ -79,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/interfaces/org.freedesktop.GeoClue2.Manager.xml
 %{_datadir}/dbus-1/system-services/org.freedesktop.GeoClue2.service
 %{_mandir}/man5/*
+%attr(755,geoclue,geoclue) %dir /var/lib/geoclue
+%if %{with systemd}
+%{_unitdir}/*
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -92,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.6-1
+- new upstream release.
+
 * Sat Sep 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.3-1
 - new upstream release.
 - enabled vala vapi.

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 55
+%define patchlevel 57
 %define kversion 5.%{sublevel}
 %define rpmversion 5.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -146,14 +146,15 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define kernel_prereq  fileutils, %{kmod}, initscripts >= 8.80, %{mkinitrd} >= %{mkinitrd_version}, linux-firmware >= 20110601-1
 
 Name: kernel
-Group: System Environment/Kernel
-License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
+Group: system
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Packager:	daisuke, shaolin, iwamoto
 
+License: GPLv2
+
 ExclusiveArch: noarch i686 x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{rpmversion}
@@ -260,7 +261,7 @@ kernel パッケージには、Linux オペレーティングシステムの心
 %package devel
 Summary: Development package for building kernel modules to match the kernel.
 Summary(ja): 特定のバージョンのカーネル用のモジュールを構築するための開発パッケージ
-Group: System Environment/Kernel
+Group: system
 AutoReqProv: no
 Provides: kernel26-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Requires: elfutils-libelf-devel
@@ -273,7 +274,7 @@ against the kernel package.
 %package source
 Summary: The source code for the Linux kernel.
 Summary(ja): Linux カーネルのソースコード
-Group: Development/Libraries
+Group: programming
 BuildArch: noarch
 Requires(pre): fileutils
 Requires: make >= 3.78
@@ -316,7 +317,7 @@ kernel-source パッケージには Linux カーネルのソースコードが
 %package doc
 Summary: Various documentation bits found in the kernel source.
 Summary(ja): カーネルソース内のさまざまなドキュメント群
-Group: Applications/Documentation
+Group: documentation
 BuildArch: noarch
 
 %description doc
@@ -339,7 +340,7 @@ Linux カーネルモジュールを読み込む際の引数を調べたい場
 %package headers
 Summary: Header files for the Linux kernel for use by glibc
 Summary(ja): Linux カーネルのヘッダファイル
-Group: Development/System
+Group: programming
 Obsoletes: glibc-kernheaders
 Provides: glibc-kernheaders = 3.0-46
 Conflicts: %{kernel_headers_conflicts}
@@ -362,7 +363,7 @@ kernel-headers パッケージには、Linux カーネルとユーザスペー
 %package firmware
 Summary: Firmware files used by the Linux kernel
 Summary(ja): Linux kernel で使用されているファームウェア
-Group: Development/System
+Group: system
 License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
 BuildArch: noarch
 
@@ -378,7 +379,7 @@ Kernel-firmware にはいくつかのデバイスを利用するために必要
 Summary: The Linux kernel compiled for PAE capable machines.
 Summary(ja): PAE 対応マシン用にコンパイルされた Linux カーネル
 
-Group: System Environment/Kernel
+Group: system
 Provides: kernel = %{rpmversion}
 Provides: kernel26 = %{rpmversion}
 Provides: kernel-drm = 4.3.0
@@ -409,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 Environment/Kernel
+Group: system
 Provides: kernel-pae-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}pae
 Provides: kernel-devel = %{rpmversion}-%{release}pae
@@ -424,7 +425,7 @@ against the PAE capable kernel package.
 %if %{with_tools}
 %package -n kernel-tools
 Summary: Assortment of tools for the Linux kernel
-Group: Development/System
+Group: admin-tools,system
 License: GPLv2
 # cpufrequtils 009 and cpuspeed 1.6 are dummy version number
 Obsoletes: cpufrequtils < 009
@@ -439,7 +440,7 @@ and the supporting documentation.
 
 %package -n kernel-tools-libs
 Summary: Libraries for the kernels-tools
-Group: Development/System
+Group: programming
 License: GPLv2
 
 %description -n kernel-tools-libs
@@ -449,7 +450,7 @@ from the kernel source.
 
 %package -n kernel-tools-libs-devel
 Summary: Assortment of tools for the Linux kernel
-Group: Development/System
+Group: programming
 License: GPLv2
 Requires: kernel-tools = %{version}-%{release}
 # Provides:  cpupowerutils-devel = 1:009-0.6.p1
@@ -466,6 +467,7 @@ the kernel source.
 %if %{with_bpftool}
 %package -n bpftool
 Summary: Inspection and simple manipulation of eBPF programs and maps
+Group: admin-tools,system
 License: GPLv2
 
 %description -n bpftool
@@ -1158,6 +1160,9 @@ fi
 
 
 %changelog
+* Sun Aug 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.57-1
+- updated to 5.4.57.
+
 * Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.55-1
 - updated to 5.4.55.
 - re-enabled to build kernel-headers on i686.

r/rng-tools/rng-tools-vl.spec

@@ -4,11 +4,14 @@
 %global _sbindir /sbin
 
 Summary:        Random number generator related utilities
+Summary(ja):    乱数生成器関連のユーティリティ
 Name:           rng-tools
 Version:        6.10
-Release:        4%{?_dist_release}
+Release:        5%{?_dist_release}%{?with_systemd:.systemd}
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
+
 License:        GPLv2+
 URL:            https://github.com/nhorman/rng-tools
 Source0:        https://github.com/nhorman/rng-tools/archive/rng-tools-%{version}.tar.gz
@@ -45,9 +48,11 @@ Requires(postun): chkconfig
 %description
 Hardware random number generation tools.
 
+
 %prep 
 %autosetup 
 
+
 %build
 ./autogen.sh
 %configure \
@@ -57,6 +62,7 @@ Hardware random number generation tools.
 
 %make_build
 
+
 %install
 %make_install
 
@@ -70,6 +76,7 @@ install -m755 %{SOURCE100} %{buildroot}%{_initdir}/rngd
 install -m644 %{SOURCE101} %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %endif
 
+
 %post
 %if %{with systemd}
 %systemd_post rngd.service
@@ -81,7 +88,7 @@ install -m644 %{SOURCE101} %{buildroot}%{_sysconfdir}/sysconfig/rngd
 %if %{with systemd}
 %systemd_preun rngd.service
 %else
-if [ "$1" = 0 ]; then
+if [ "$1" = 0 -o -x /bin/systemctl ]; then
   /sbin/service stop rngd >/dev/null 2>&1 ||:
   /sbin/chkconfig --del rngd
 fi
@@ -96,6 +103,7 @@ if [ "$1" != 0 ]; then
 fi
 %endif
 
+
 %files
 %{!?_licensedir:%global license %%doc}
 %license COPYING
@@ -111,6 +119,10 @@ fi
 %attr(0644,root,root)   %config(noreplace) %{_sysconfdir}/sysconfig/rngd
 %endif
 
+
 %changelog
+* Sun Aug 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 6.10-5
+* added suffix to %%release with systemd build.
+
 * Thu Apr 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 6.10-4
 - initial build for Vine Linux.