From cf48e60a10f7d5045958662bf755689b0ef34410 Mon Sep 17 00:00:00 2001 From: Lukáš Zaoral Date: Jan 30 2023 08:51:40 +0000 Subject: Update to v12.7.2 (rhbz#2165400) - Use SPDX license format - Modernize the spec file according to the current packaging guidelines Resolves: rhbz#2165400 --- diff --git a/.gitignore b/.gitignore index b04c91b..b33cbdd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /v12.5.6.tar.gz /v12.6.0.tar.gz /v12.7.1.tar.gz +/v12.7.2.tar.gz diff --git a/sources b/sources index cb13e33..cc55343 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v12.7.1.tar.gz) = 5c1da0f5a1bf26091f029c5ea138f836616becb1e531843aa2c150a66ddc1f07b43cffeac98445855bf70319942fe22838a682c2f7685893bead7d8de7e9e2a8 +SHA512 (v12.7.2.tar.gz) = c9dbde263122c4adc0d22769a1ba69c9011bc8264a9298c0c2fcd3262a785e9cef34b69bb84ddc2bafbf11de5f2110946bbe7e88a98f03f99524894a5c02e0de diff --git a/sysstat.spec b/sysstat.spec index 21a7d92..1e99008 100644 --- a/sysstat.spec +++ b/sysstat.spec @@ -1,9 +1,10 @@ Summary: Collection of performance monitoring tools for Linux Name: sysstat -Version: 12.7.1 -Release: 2%{?dist} -License: GPLv2+ -URL: http://sebastien.godard.pagesperso-orange.fr/ +Version: 12.7.2 +Release: 1%{?dist} +License: GPL-2.0-or-later + +URL: http://sebastien.godard.pagesperso-orange.fr Source: https://github.com/sysstat/sysstat/archive/v%{version}.tar.gz BuildRequires: gcc @@ -39,7 +40,6 @@ The cifsiostat command reports I/O statistics for CIFS file systems. %autosetup -S git_am %build -%set_build_flags %configure \ --enable-install-cron \ --enable-copy-only \ @@ -51,12 +51,15 @@ The cifsiostat command reports I/O statistics for CIFS file systems. sadc_options='-S DISK' \ history=28 \ compressafter=31 -make %{?_smp_mflags} +%make_build %install %make_install %find_lang %{name} +# Do not install the license as documentation +rm %{buildroot}%{_docdir}/%{name}/COPYING + %post %systemd_post sysstat.service sysstat-collect.timer sysstat-summary.timer @@ -71,17 +74,39 @@ fi %systemd_postun sysstat.service sysstat-collect.timer sysstat-summary.timer %files -f %{name}.lang -%doc CHANGES COPYING CREDITS FAQ.md README.md %{name}-%{version}.lsm +%license COPYING +%doc CHANGES CREDITS FAQ.md README.md %{name}-%{version}.lsm %config(noreplace) %{_sysconfdir}/sysconfig/sysstat %config(noreplace) %{_sysconfdir}/sysconfig/sysstat.ioconf -%{_bindir}/* +%{_bindir}/cifsiostat +%{_bindir}/iostat +%{_bindir}/mpstat +%{_bindir}/pidstat +%{_bindir}/sadf +%{_bindir}/sar +%{_bindir}/tapestat %{_libdir}/sa %{_unitdir}/sysstat* %{_systemd_util_dir}/system-sleep/sysstat* -%{_mandir}/man*/* +%{_mandir}/man1/cifsiostat.1* +%{_mandir}/man1/iostat.1* +%{_mandir}/man1/mpstat.1* +%{_mandir}/man1/pidstat.1* +%{_mandir}/man1/sadf.1* +%{_mandir}/man1/sar.1* +%{_mandir}/man1/tapestat.1* +%{_mandir}/man5/sysstat.5* +%{_mandir}/man8/sa1.8* +%{_mandir}/man8/sa2.8* +%{_mandir}/man8/sadc.8* %{_localstatedir}/log/sa %changelog +* Mon Jan 30 2023 Lukáš Zaoral - 12.7.2-1 +- Update to v12.7.2 (rhbz#2165400) +- Use SPDX license format +- Modernize the spec file according to the current packaging guidelines + * Sat Jan 21 2023 Fedora Release Engineering - 12.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild