Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nagios-rpm-macros for
openSUSE:Factory checked in at 2021-06-15 16:38:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nagios-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.nagios-rpm-macros.new.32437 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nagios-rpm-macros"
Tue Jun 15 16:38:18 2021 rev:21 rq:900162 version:0.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/nagios-rpm-macros/nagios-rpm-macros.changes
2017-12-14 11:03:32.662059014 +0100
+++
/work/SRC/openSUSE:Factory/.nagios-rpm-macros.new.32437/nagios-rpm-macros.changes
2021-06-15 16:38:55.913859218 +0200
@@ -1,0 +2,6 @@
+Fri Jun 11 12:02:11 UTC 2021 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Move macros.nagios from /etc/rpm to %{_rpmmacrodir}
+ (boo#1185657).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nagios-rpm-macros.spec ++++++
--- /var/tmp/diff_new_pack.Y4hGtu/_old 2021-06-15 16:38:56.309859903 +0200
+++ /var/tmp/diff_new_pack.Y4hGtu/_new 2021-06-15 16:38:56.313859911 +0200
@@ -1,8 +1,7 @@
#
# spec file for package nagios-rpm-macros
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2014-2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -13,17 +12,17 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: nagios-rpm-macros
+Version: 0.14
+Release: 0
Summary: RPM Macros for Nagios based packages
License: BSD-3-Clause
Group: System/Monitoring
-Version: 0.14
-Release: 0
-Url: http://en.opensuse.org/Nagios
+URL: http://en.opensuse.org/Nagios
Source0: macros.nagios
Source1: %{name}-README
Source2: nagios-rpm-macros-COPYING
@@ -33,38 +32,33 @@
Source6: macros.icinga
Source7: macros.icinga2
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This package provides rpm macros for building packages for
Nagios, check_mk and/or Icinga.
-
%prep
-%{__cp} %{S:1} README
-%{__cp} %{S:2} COPYING
+cp %{SOURCE1} README
+cp %{SOURCE2} COPYING
%build
%install
-install -Dm644 %{S:0} %{buildroot}%{_sysconfdir}/rpm/macros.nagios
-cat %{S:3} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
-cat %{S:4} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
-cat %{S:5} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
-cat %{S:6} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
-cat %{S:7} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
+install -Dm644 %{SOURCE0} %{buildroot}%{_rpmmacrodir}/macros.nagios
+cat %{SOURCE3} >> %{buildroot}%{_rpmmacrodir}/macros.nagios
+cat %{SOURCE4} >> %{buildroot}%{_rpmmacrodir}/macros.nagios
+cat %{SOURCE5} >> %{buildroot}%{_rpmmacrodir}/macros.nagios
+cat %{SOURCE6} >> %{buildroot}%{_rpmmacrodir}/macros.nagios
+cat %{SOURCE7} >> %{buildroot}%{_rpmmacrodir}/macros.nagios
# make sure that _rundir is working on older systems
%if ! %{defined _rundir}
-sed -i 's|%%{_rundir}|%%{_localstatedir}/run|'
%{buildroot}%{_sysconfdir}/rpm/macros.nagios
+sed -i 's|%%{_rundir}|%%{_localstatedir}/run|'
%{buildroot}%{_rpmmacrodir}/macros.nagios
%endif
-%clean
-rm -rf %buildroot
-
%files
-%defattr(-,root,root)
-%doc COPYING README
-%config %{_sysconfdir}/rpm/macros.nagios
+%license COPYING
+%doc README
+%{_rpmmacrodir}/macros.nagios
%changelog
