updated 10 packages

docker-ce-24.0.2-1

docker-compose-2.18.1-1

lm-sensors-3.6.0-1

libsmbios-2.4.3-3

libssh-0.9.7-1

libssh2-1.11.0-1

libva-2.18.0-1

openldap-2.6.4-1

python-mako-1.2.4-1

smartmontools-7.3-1

d/docker-ce/docker-ce-vl.spec

@@ -7,7 +7,7 @@
 
 Name: docker-ce
 Summary: The open-source application container engine
-Version: 20.10.23
+Version: 24.0.2
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system,virtualization
 Vendor: Project Vine
@@ -151,6 +151,7 @@ fi
 %{_bindir}/docker-init
 %{_bindir}/docker-proxy
 %{_bindir}/dockerd
+%{_bindir}/runc
 %dir %{_localstatedir}/lib/docker
 %if %{with systemd}
 %{_unitdir}/docker.service
@@ -168,10 +169,12 @@ fi
 %license LICENSE
 %doc README.md
 %{_bindir}/docker
-%{_bindir}/runc
 
 
 %changelog
+* Thu Jun 08 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 24.0.2-1
+- new upstream release.
+
 * Mon Feb 13 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.10.23-1
 - new upstream release.
 

d/docker-compose/docker-compose-vl.spec

@@ -6,7 +6,7 @@
 
 Name: docker-compose
 Summary: Define and run multi-container applications with Docker
-Version: 2.16.0
+Version: 2.18.1
 Release: 1%{?_dist_release}
 Group: admin-tools,virtualization
 Vendor: Project Vine
@@ -54,6 +54,9 @@ install -p -m 755 %{SOURCE2} ./
 
 
 %changelog
+* Thu Jun 08 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.18.1-1
+- new upstream release.
+
 * Mon Feb 13 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.16.0-1
 - new upstream release.
 

l/lm-sensors/lm-sensors-vl.spec

@@ -1,17 +1,35 @@
+%bcond_with systemd
+
 Summary: Hardware monitoring tools
 Summary(ja): ハードウェア監視ツール集
 Name: lm-sensors
-Version: 3.5.0
+Version: 3.6.0
-Release: 1%{?_dist_release}
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: shaolin, owa
 
 %global ver_str %(echo -n "%{version}" | sed -e 's/\\./-/g')
 
-Group: Applications/System
 License: LGPLv2+ and GPLv3+ and GPLv2+ and Verbatim and Public Domain
 URL: https://github.com/lm-sensors/lm-sensors
-
+Source0: https://github.com/lm-sensors/lm-sensors/archive/V%{ver_str}/lm-sensors-%{ver_str}.tar.gz
-Source0: https://github.com/lm-sensors/lm-sensors/archive/lm_sensors-%{version}.tar.gz#/lm-sensors-%{ver_str}.tar.gz
 Source1: lm_sensors.sysconfig
+# This one was taken from PLD-linux, Thanks!
+Source2: sensord.sysconfig
+Source3: lm_sensors-modprobe-wrapper
+Source4: lm_sensors-modprobe-r-wrapper
+Source5: sensord.service
+Source6: sensord-service-wrapper
+Source7: lm_sensors.service
+Source8: lm_sensors-wrapper
+
+# Upstream patch:
+Patch1: 0001-Change-PIDFile-path-from-var-run-to-run.patch
+Patch2: lm_sensors-3.6.0-allow_no_sensors.patch
+# Upstream commit 5deee7d0c301df779:
+Patch3: lm_sensors-3.6.0-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bison
@@ -26,22 +44,22 @@ BuildRequires: sysfsutils-devel
 BuildRequires: rrdtool-devel
 
 Requires: perl
+%if %{with systemd}
+%else
 Requires: initscripts
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
-
+%endif
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: shaolin, owa
 
 %description
 The lm-sensors package includes a collection of modules for general SMBus
 access and hardware monitoring.
 
+
 %package libs
 Summary: Lm_sensors core libraries
 Summary(ja): Lm_sensors コアライブラリ
-Group: System Environment/Libraries
+Group: system
 
 %description libs
 Core libraries for lm_sensors applications
@@ -50,7 +68,7 @@ Core libraries for lm_sensors applications
 %package devel
 Summary: Development files for programs which will use lm_sensors
 Summary(ja): lm_sensors を使用するプログラムのための開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
@@ -61,59 +79,125 @@ when building applications that make use of sensor data.
 %package sensord
 Summary: Daemon that periodically logs sensor readings
 Summary(ja): センサーの読み取り値を定期的に記録するデーモン
-Group: System Environment/Daemons
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description sensord
 Daemon that periodically logs sensor readings to syslog or a round-robin
 database, and warns of sensor alarms.
 
+
+%debug_package
+
+
 %prep
 %setup -q -n lm-sensors-%{ver_str}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+# Remove currently unused files to make sure we've got the license right
+rm -f prog/init/sysconfig-lm_sensors-convert prog/hotplug/unhide_ICH_SMBus
+
+mv prog/init/README prog/init/README.initscripts
+chmod -x prog/init/fancontrol.init
+
+# fixing the sensord-service-wrapper path
+cp -p %{SOURCE5} sensord.service
+cp -p %{SOURCE7} lm_sensors.service
+sed -i "s|\@WRAPPER_DIR\@|%{_libexecdir}/%{name}|" sensord.service
+sed -i "s|\@WRAPPER_DIR\@|%{_libexecdir}/%{name}|" lm_sensors.service
+
+
 
 %build
-export CFLAGS="%{optflags}"
+%set_build_flags
-make PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} EXLDFLAGS=  user
+make PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} \
+	EXLDFLAGS="$LDFLAGS" PROG_EXTRA=sensord BUILD_STATIC_LIB=0 user
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make user_install \
-     DESTDIR=$RPM_BUILD_ROOT \
+     DESTDIR=%{buildroot} \
      PREFIX=%{_prefix} \
      LIBDIR=%{_libdir} \
      ETCDIR=%{_sysconfdir} \
-     MANDIR=%{_mandir} 
+     MANDIR=%{_mandir} \
+     PROG_EXTRA=sensord \
+     BUILD_STATIC_LIB=0 \
+     user_install
 
-ln -s sensors.conf.5.gz $RPM_BUILD_ROOT%{_mandir}/man5/sensors3.conf.5.gz
+ln -s sensors.conf.5.gz %{buildroot}%{_mandir}/man5/sensors3.conf.5.gz
 
 # add initscript from proc/init
-mkdir -p $RPM_BUILD_ROOT%{_initdir}
+mkdir -p %{buildroot}%{_sysconfdir}/sensors.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sensors.d
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/lm_sensors
-install -m755 prog/init/lm_sensors.init $RPM_BUILD_ROOT%{_initdir}/lm_sensors
+
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lm_sensors
+%if %{with systemd}
+install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/sensord
+
+# service files
+mkdir -p %{buildroot}%{_unitdir}
+install -pm 644 prog/init/fancontrol.service %{buildroot}%{_unitdir}
+install -pm 644 lm_sensors.service           %{buildroot}%{_unitdir}
+install -pm 644 sensord.service              %{buildroot}%{_unitdir}
+
+# customized modprobe calls
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+install -pm 755 %{SOURCE3} %{buildroot}%{_libexecdir}/%{name}/lm_sensors-modprobe-wrapper
+install -pm 755 %{SOURCE4} %{buildroot}%{_libexecdir}/%{name}/lm_sensors-modprobe-r-wrapper
+install -pm 755 %{SOURCE8} %{buildroot}%{_libexecdir}/%{name}/lm_sensors-wrapper
+
+# sensord service wrapper
+install -pm 755 %{SOURCE6} %{buildroot}%{_libexecdir}/%{name}/sensord-service-wrapper
+%else
+mkdir -p %{buildroot}%{_initdir}
+install -m755 prog/init/lm_sensors.init %{buildroot}%{_initdir}/lm_sensors
+%endif
 
 # remove unuse files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
+rm -f %{buildroot}/%{_libdir}/*.a
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %post
+%if %{with systemd}
+%systemd_post lm_sensors.service
+%else
 if [ "$1" = 1 ] ; then
 	/sbin/chkconfig --add lm_sensors
 fi
 %{_initdir}/lm_sensors condrestart
+%endif
 
 %preun
+%if %{with systemd}
+%systemd_preun lm_sensors.service
+%else
 if [ "$1" = 0 ] ; then
 	%{_initdir}/lm_sensors stop > /dev/null 2>&1
     /sbin/chkconfig --del lm_sensors
 fi
+%endif
+
+%if %{with systemd}
+%postun
+%systemd_postun_with_restart lm_sensors.service
 
-%post libs -p /sbin/ldconfig
+%post sensord
+%systemd_post sensord.service
 
-%postun libs -p /sbin/ldconfig
+%preun sensord
+%systemd_preun sensord.service
+
+%postun sensord
+%systemd_postun_with_restart sensord.service
+%endif
 
 
 %files
@@ -123,19 +207,22 @@ fi
 %dir %{_sysconfdir}/sensors.d
 %config(noreplace) %{_sysconfdir}/sensors3.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/lm_sensors
+%{_bindir}/*
+%{_sbindir}/*
+%if %{with systemd}
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/lm_sensors-modprobe*wrapper
+%{_libexecdir}/%{name}/lm_sensors-wrapper
+%{_unitdir}/lm_sensors.service
+%{_unitdir}/fancontrol.service
+%else
 %config %{_initdir}/lm_sensors
-%{_bindir}/sensors
-%{_bindir}/sensors-conf-convert
-%{_sbindir}/fancontrol
-%ifarch %{ix86} x86_64
-%{_sbindir}/isadump
-%{_sbindir}/isaset
 %endif
-%{_sbindir}/pwmconfig
-%{_sbindir}/sensors-detect
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
+%exclude %{_sbindir}/sensord
+%exclude %{_mandir}/man8/sensord.8.gz
 
 %files libs
 %{_libdir}/lib*.so.*
@@ -145,8 +232,22 @@ fi
 %{_libdir}/lib*.so
 %{_mandir}/man3/*
 
+%if %{with systemd}
+%files sensord
+	
+%doc prog/sensord/README
+%{_sbindir}/sensord
+%{_mandir}/man8/sensord.8.gz
+%config(noreplace) %{_sysconfdir}/sysconfig/sensord
+%{_unitdir}/sensord.service
+%{_libexecdir}/%{name}/sensord-service-wrapper
+%endif
+
 
 %changelog
+* Mon May 29 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.0-1
+- updated to 3.6.0.
+
 * Fri May 10 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.0-1
 - updated to 3.5.0.
 

lib/libs/libsmbios/libsmbios-vl.spec

@@ -1,6 +1,6 @@
 Name: libsmbios
 Version: 2.4.3
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Summary: Libsmbios C/C++ shared libraries
 Summary(ja): Libsmbios C/C++ 共有ライブラリ
 Group: system
@@ -105,6 +105,9 @@ This package contains the headers and .a files necessary to compile new client
 programs against libsmbios.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n libsmbios-%{version}
 find . -type d -exec chmod -f 755 {} \;
@@ -185,10 +188,6 @@ EOF
 rm -rf %{buildroot}
 
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %files -f _build/%{lang_dom}.lang
 %defattr(-,root,root,-)
 %license COPYING* src/bin/getopts_LICENSE.txt src/include/smbios_c/config/boost_LICENSE_1_0_txt
@@ -236,6 +235,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jun 06 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.3-3
+- rebuilt with python3.11.
+
 * Tue Aug 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.3-2
 - rebuilt with python3.8.
 

lib/libs/libssh/libssh-vl.spec

@@ -3,8 +3,8 @@
 Summary:        A library implementing the SSH2 protocol
 Summary(ja):    SSH2プロトコルを実装するためのライブラリ
 Name:           libssh
-Version:        0.9.6
+Version:        0.9.7
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 07 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.7-1
+- new upstream release.
+
 * Tue Oct 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.6-2
 - rebuilt with openssl-3.0.0.
 

lib/libs/libssh2/libssh2-vl.spec

@@ -3,8 +3,8 @@
 Summary:        A library implementing the SSH2 protocol
 Summary(ja):    SSH2 プロトコルを実装するためのライブラリ
 Name:           libssh2
-Version:        1.10.0
+Version:        1.11.0
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -12,8 +12,10 @@ Distribution:   Vine Linux
 License:        BSD
 URL:            https://www.libssh2.org/
 Source0:        https://www.libssh2.org/download/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+# upstream patch for tests
+Patch1:         572c57c9d8d4e89cfce19dde40125d55481256d1.patch
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel   
 
@@ -64,10 +66,11 @@ SECSH-DHGEX(04), and SECSH-NUMBERS(10).
 
 %prep
 %setup -q
+%autopatch -p1
 
 # Replace hard wired port number in the test suite to avoid collisions
 # between 32-bit and 64-bit builds running on a single build-host
-sed -i s/4711/47%{__isa_bits}/ tests/ssh2.{c,sh}
+sed -i s/4711/47%{__isa_bits}/ tests/{test_ssh2.c,test_sshd.test}
 
 # make sure things are UTF-8...
 for i in ChangeLog NEWS ; do
@@ -75,11 +78,15 @@ for i in ChangeLog NEWS ; do
     mv new $i
 done
 
+autoreconf -ivf
+
+
 %build
 %configure --disable-static --enable-shared
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
@@ -91,8 +98,12 @@ find %{buildroot} -name '*.la' -exec rm -f {} +
 rm -rf example/simple/.deps 
 find example/ -type f '(' -name '*.am' -o -name '*.in' ')' -exec rm -v {} +
 
+
+%if 0
+# docker is needed
 %check
 (cd tests && make check)
+%endif
 
 
 %clean
@@ -126,6 +137,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jun 05 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.11.0-1
+- new upstream release.
+
 * Tue Oct 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.0-2
 - rebuilt with openssl-3.0.0.
 

lib/libv/libva/libva-vl.spec

@@ -1,8 +1,8 @@
 Name:           libva
-Version:        2.8.0
+Version:        2.18.0
 Release:        1%{?_dist_release}
 Summary:        Video Acceleration (VA) API for Linux
-Group:          System Environment/Libraries
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Packager:       daisuke
@@ -12,6 +12,8 @@ URL:            https://github.com/intel/libva
 Source0:        https://github.com/intel/libva/releases/download/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  meson
+BuildRequires:  ninja
 BuildRequires:  libudev-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXfixes-devel
@@ -20,7 +22,9 @@ BuildRequires:  libpciaccess-devel
 BuildRequires:  mesa-libEGL-devel
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLES-devel
-BuildRequires:  libtool, automake, autoconf
+BuildRequires:  wayland-devel
+BuildRequires:  pkgconfig(wayland-client) >= 1
+BuildRequires:  pkgconfig(wayland-scanner) >= 1
 
 Obsoletes:      libva-tools < 2.8.0
 
@@ -31,7 +35,7 @@ The library loads a hardware dependendent driver.
 
 %package devel
 Summary:        Development tools for programs which will use %{name}
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 
 %description devel
@@ -46,40 +50,21 @@ Requires:       %{name} = %{version}-%{release}
 This package contains sample tools for %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
 
 %build
-if [ -x ./autogen.sh ]; then
+%meson
-  ./autogen.sh
+%meson_build
-fi
-%configure \
-	--disable-static \
-	--enable-x11 \
-	--enable-drm \
-	--enable-glx \
-	--enable-va-messaging
-
-# remove rpath from libtool
-sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
+%meson_install
-%make_install INSTALL="install -p"
-find %{buildroot} -regex ".*\.la$" | xargs rm -f --
-
 
-%clean
-rm -rf %{buildroot}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -95,6 +80,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon May 29 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.18.0-1
+- new upstream release.
+
 * Thu Jul 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.0-1
 - new upstream release.
 

o/openldap/openldap-vl.spec

@@ -8,7 +8,7 @@
 Summary: The configuration files, libraries and documentation for OpenLDAP.
 Summary(ja): OpenLDAP の設定ファイル，ライブラリ，ドキュメント.
 Name: openldap
-Version: 2.6.3
+Version: 2.6.4
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
@@ -604,6 +604,9 @@ fi
 
 
 %changelog
+* Wed Jun 07 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.4-1
+- new upstream release.
+
 * Fri Nov 11 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.3-1
 - new upstream release.
 

p/python-mako/python-mako-vl.spec

@@ -1,7 +1,7 @@
 Summary:        Mako template library for Python
 Summary(ja):    Python の Mako テンプレートライブラリ
 Name:           python-mako
-Version:        1.1.3
+Version:        1.2.4
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -9,15 +9,13 @@ Distribution:   Vine Linux
 
 License:        MIT
 URL:            http://www.makotemplates.org/
-Source0:        Mako-%{version}.tar.gz
+Source0:        https://github.com/sqlalchemy/mako/archive/rel_%(echo %{version} | sed "s/\./_/g").tar.gz#/Mako-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-setuptools
 BuildRequires:  python-rpm-macros
-BuildRequires:  python-setuptools
-Requires:       python-beaker
 
 %description
 Mako is a template library written in Python. It provides a familiar, non-XML
@@ -48,17 +46,15 @@ calling and scoping semantics.
 
 
 %prep
-%setup -q -n Mako-%{version}
+%setup -q -n mako-rel_%(echo %{version} | sed "s/\./_/g")
 
 
 %build
-%py_build
 %py3_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%py_install
 %py3_install
 
  
@@ -66,12 +62,6 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
-%defattr(-,root,root,-)
-%license LICENSE
-%doc CHANGES README.rst doc/ examples/
-%{python_sitelib}/*
-
 %files -n python3-mako
 %license LICENSE
 %doc CHANGES README.rst doc/ examples/
@@ -79,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitelib}/*
 
 %changelog
+* Mon May 29 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.4-1
+- new upstream release.
+- dropped python2 support.
+
 * Thu Oct 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.3-1
 - new upstream release.
 

s/smartmontools/smartmontools-vl.spec

@@ -3,10 +3,10 @@
 Summary:	smartmontools - for monitoring S.M.A.R.T. disks and devices
 Summary(ja):	smartmontools - S.M.A.R.T.ディスクとデバイスの監視
 Name:		smartmontools
-Version:	7.1
+Version:	7.3
 Release:	1%{?_dist_release}%{?with_systemd:.systemd}
 License:	GPLv2+
-Group:		Applications/System
+Group:		system
 URL:		http://smartmontools.sourceforge.net/
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -15,6 +15,8 @@ Source0:	http://downloads.sourceforge.net/smartmontools/%{name}-%{version}.tar.g
 Source1:	ChangeLog.upstream
 Source2:	smartmontools.sysconfig
 Source3:	smartd.init
+# https://github.com/smartmontools/smartmontools/raw/master/smartmontools/drivedb.h
+Source5:	drivedb.h
 Patch0:		smartmontools-5.42-vinerelease.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Obsoletes:	smartctl
@@ -23,6 +25,7 @@ Obsoletes:	ucsc-smartsuite
 Obsoletes:	smartsuite
 Requires:	fileutils
 BuildRequires:	readline-devel ncurses-devel automake util-linux groff gettext
+BuildRequires:	libcap-ng-devel
 
 %if %{with systemd}
 BuildRequires:  systemd systemd-devel
@@ -83,9 +86,13 @@ smartctlおよびman smartdで得られます。最新のバージョン及び
 ての情報は次のURLにあります：http://smartmontools.sourceforge.net/
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch0 -p0
+cp -f %{SOURCE5} .
 
 # fix encoding
 for fe in AUTHORS ChangeLog*
@@ -100,6 +107,7 @@ done
 autoreconf -i
 %configure \
 	--without-selinux \
+	--with-libcap-ng=yes \
 %if %{with systemd}
 	--with-libsystemd \
 	--with-systemdsystemunitdir=%{_unitdir} \
@@ -107,6 +115,11 @@ autoreconf -i
 %endif
 	%{nil}
 
+# update SOURCE5 on maintainer's machine prior commiting, there's no internet connection on builders
+%make_build update-smart-drivedb
+./update-smart-drivedb -s - -u sf drivedb.h ||:
+cp drivedb.h ../drivedb.h ||:
+
 %make_build CXXFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro,-z,now"
 
 
@@ -168,7 +181,8 @@ fi
 
 %preun
 %if %{with systemd}
-%systemd_preun smartd.service%else
+%systemd_preun smartd.service
+%else
 # if uninstalling the final copy, stop and remove any links	
 if [ "$1" = "0" -o -x /bin/systemctl ]; then
   if [ -f /var/lock/subsys/smartd ]; then
@@ -192,6 +206,7 @@ fi
 %systemd_postun_with_restart smartd.service
 %endif
 
+
 %files
 %defattr(-,root,root)
 %license COPYING
@@ -212,6 +227,7 @@ fi
 %attr(755,root,root) /etc/rc.d/init.d/smartd
 %endif
 
+
 # Maintainers / Developers Key:
 # [BA] Bruce Allen
 # [EB] Erik Inge Bols# [SB] Stanislav Brabec
@@ -230,6 +246,9 @@ fi
 # [PW] Phil Williams
 
 %changelog
+* Sat Jun 10 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.3-1
+- new upstream release.
+
 * Wed Apr 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.1-1
 - new upstream release.
 - shrank %%changelog: old logs are ChangeLog.upstream.