Hello community,
here is the log from the commit of package collectl for openSUSE:Factory
checked in at 2018-04-16 12:48:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/collectl (Old)
and /work/SRC/openSUSE:Factory/.collectl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectl"
Mon Apr 16 12:48:35 2018 rev:30 rq:596306 version:4.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/collectl/collectl.changes 2017-11-25
08:43:32.188339498 +0100
+++ /work/SRC/openSUSE:Factory/.collectl.new/collectl.changes 2018-04-16
12:48:38.637865517 +0200
@@ -1,0 +2,7 @@
+Wed Apr 11 15:06:23 UTC 2018 - mplus...@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Use correct systemd build dependency
+- Reduce duplicities in package via fdupes
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ collectl.spec ++++++
--- /var/tmp/diff_new_pack.XlWWtl/_old 2018-04-16 12:48:39.273842382 +0200
+++ /var/tmp/diff_new_pack.XlWWtl/_new 2018-04-16 12:48:39.277842237 +0200
@@ -1,7 +1,7 @@
#
# spec file for package collectl
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,18 @@
#
-#Compat macro for new _fillupdir macro introduced in Nov 2017
-%if ! %{defined _fillupdir}
- %define _fillupdir /var/adm/fillup-templates
-%endif
-
Name: collectl
Version: 4.1.3
Release: 0
Summary: Collects data that describes the current system status
-License: Artistic-1.0 and GPL-2.0+
+License: Artistic-1.0 AND GPL-2.0-or-later
Group: System/Monitoring
-Url: http://collectl.sourceforge.net
+URL: http://collectl.sourceforge.net
Source0:
http://sourceforge.net/projects/collectl/files/collectl/%{name}-%{version}/%{name}-%{version}.src.tar.gz
Source1: collectl.service
Source2: collectl.sysconfig
-BuildRequires: pkgconfig(systemd)
+BuildRequires: fdupes
+BuildRequires: systemd-rpm-macros
BuildArch: noarch
%{?systemd_requires}
@@ -64,6 +60,7 @@
install -m 644 -D %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.collectl
install -m 644 -D man1/collectl.1 %{buildroot}%{_mandir}/man1/collectl.1
install -m 644 -D man1/colmux.1 %{buildroot}%{_mandir}/man1/colmux.1
+%fdupes -s %{buildroot}
%post
%fillup_only
@@ -80,8 +77,8 @@
%service_del_postun %{name}.service
%files
-%defattr(-,root,root)
-%doc docs/* COPYING ARTISTIC GPL README RELEASE-collectl
+%license COPYING ARTISTIC GPL
+%doc docs/* README RELEASE-collectl
%{_unitdir}/collectl.service
%{_fillupdir}/sysconfig.collectl
%config(noreplace) %{_sysconfdir}/collectl.conf
@@ -90,7 +87,7 @@
%{_sbindir}/collectl
%{_sbindir}/rccollectl
%{_datadir}/collectl
-%{_mandir}/man1/collectl.1.gz
-%{_mandir}/man1/colmux.1.gz
+%{_mandir}/man1/collectl.1%{?ext_man}
+%{_mandir}/man1/colmux.1%{?ext_man}
%changelog
