Browse Source

updated 2 packages

dkms-2.8.4-1

tomoyo-tools-2.6.0.20201111-1
Tomohiro "Tomo-p" KATO 1 year ago
parent
commit
7a29db618e
2 changed files with 18 additions and 12 deletions
  1. 9 7
      d/dkms/dkms-vl.spec
  2. 9 5
      t/tomoyo-tools/tomoyo-tools-vl.spec

+ 9 - 7
d/dkms/dkms-vl.spec

@@ -3,9 +3,9 @@
 Summary:        Dynamic Kernel Module Support Framework
 Summary(ja):    DKMS (ダイナミックカーネルモジュールサポート) フレームワーク
 Name:           dkms
-Version:        2.8.1
+Version:        2.8.4
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
-Group:          System Environment/Base
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Packager:       shaolin, daisuke
@@ -14,8 +14,6 @@ License:        GPLv2+
 URL:            https://github.com/dell/dkms/
 Source0:        https://github.com/dell/dkms/archive/v%{version}.tar.gz#/dkms-%{version}.tar.gz
 
-# git HEAD at 2020-05-01
-Patch0:         dkms-2.8.1-20200501.patch
 Patch100:       dkms-2.8.1-mkrpm-vine.patch
 Patch101:       dkms-2.8.1-mkkmp-vine.patch
 Patch102:       dkms-2.8.1-autoinstaller-vine.patch
@@ -69,7 +67,6 @@ module RPMS as originally developed by Dell.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -94,7 +91,8 @@ make install-redhat-sysv \
 install -p -m 755 -D kernel_install.d_dkms \
     %{buildroot}%{_prefix}/lib/kernel/install.d/40-%{name}.install
 sed -i -e 's|/usr/bin/bash|/bin/bash|g' \
-    %{buildroot}%{_prefix}/lib/kernel/install.d/40-%{name}.install
+    %{buildroot}%{_prefix}/lib/kernel/install.d/40-%{name}.install \
+    %{buildroot}%{_sysconfdir}/%{name}/kernel_install.d_dkms
 
 
 %clean
@@ -133,7 +131,7 @@ rm -rf %{buildroot}
 %{_prefix}/lib/kernel/install.d/40-%{name}.install
 %{_mandir}/man8/dkms.8*
 %{_sbindir}/%{name}
-%{_sharedstatedir}/%{name}
+%{_localstatedir}/lib/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}
 %{_sysconfdir}/kernel/postinst.d/%{name}
 %{_sysconfdir}/kernel/prerm.d/%{name}
@@ -148,6 +146,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 16 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.4-1
+- new upstream release.
+- dropped Patch0: fixed in upstream.
+
 * Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.1-1
 - new upstream release.
 - updated Patch100-103.

+ 9 - 5
t/tomoyo-tools/tomoyo-tools-vl.spec

@@ -1,12 +1,13 @@
 %bcond_with systemd
 
-%global ver     2.6.0-20200229
+%global ver     2.6.0-20201111
 
 Summary:        utilities for TOMOYO Linux
 Summary(ja):    TOMOYO Linux用のユーティリティ
 Name:           tomoyo-tools
 Version:        %(echo %{ver} | tr "-" ".")
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Group:          admin-tools,security
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -37,6 +38,9 @@ on a Linux kernel with TOMOYO support.
 デーモンと管理ユーティリティを提供します。
 
 
+%debug_package
+
+
 %prep
 %setup -q -n tomoyo-tools
 
@@ -61,10 +65,6 @@ rm -f %{buildroot}%{_libdir}/tomoyo/{README.tomoyo,COPYING.tomoyo}
 %{__rm} -rf %{buildroot}
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %files
 %defattr(-,root,root)
 %license COPYING*
@@ -81,5 +81,9 @@ rm -f %{buildroot}%{_libdir}/tomoyo/{README.tomoyo,COPYING.tomoyo}
 
 
 %changelog
+* Wed Mar 17 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.0.20201111-1
+- new upstream release.
+- dropped acriptlets.
+
 * Wed Jul 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.0.20200229-1
 - initial build for Vine Linux.