Hello community,
here is the log from the commit of package munge for openSUSE:Factory checked
in at 2018-06-20 15:31:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/munge (Old)
and /work/SRC/openSUSE:Factory/.munge.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "munge"
Wed Jun 20 15:31:12 2018 rev:8 rq:617651 version:0.5.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/munge/munge.changes 2018-06-13
15:41:10.400624097 +0200
+++ /work/SRC/openSUSE:Factory/.munge.new/munge.changes 2018-06-20
15:32:32.351502572 +0200
@@ -1,0 +2,13 @@
+Tue Jun 19 06:34:58 UTC 2018 - e...@suse.com
+
+- Handle license file using %license where applicable.
+
+-------------------------------------------------------------------
+Sat Jun 16 05:11:21 UTC 2018 - e...@suse.com
+
+- Package sysconfig.munge only on non-systemd systems.
+- Fix group settings for non-systemd systems in spec file:
+ group 'munge' is used there as well.
+- Some macro cleanup.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ munge.spec ++++++
--- /var/tmp/diff_new_pack.7acPal/_old 2018-06-20 15:32:33.779450761 +0200
+++ /var/tmp/diff_new_pack.7acPal/_new 2018-06-20 15:32:33.783450616 +0200
@@ -26,11 +26,10 @@
%endif
%define lversion 2
+%define munge_g %name
%if 0%{?have_systemd}
- %define munge_g %name
%define munge_u %name
%else
- %define munge_g root
%define munge_u daemon
%endif
@@ -38,7 +37,7 @@
Version: 0.5.13
Release: 0
Summary: An authentication service for creating and validating
credentials
-License: GPL-3.0+ and LGPL-3.0+
+License: GPL-3.0-or-later AND LGPL-3.0-or-later
Group: Productivity/Security
Url: http://dun.github.io/munge/
Source0: https://github.com/dun/munge/archive/%{name}-%{version}.tar.gz
@@ -103,11 +102,9 @@
%install
%makeinstall
-%{__rm} -f %{buildroot}%{_libdir}/*.la
-%{__rm} -f %{buildroot}%{_libdir}/*.a
-%{__install} -m 0755 -d %{buildroot}%{_fillupdir}
-%{__cp} -p %{S:2} %{buildroot}%{_fillupdir}/sysconfig.munge
-%{__rm} -f %{buildroot}%{_sysconfdir}/sysconfig/munge
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.a
+rm -f %{buildroot}%{_sysconfdir}/sysconfig/munge
# We don't want systemd file on SLE 11
%if 0%{!?have_systemd:1}
@@ -117,7 +114,9 @@
rm -f %{buildroot}/lib/systemd/system/munge.service
rm -f %{buildroot}/%{_tmpfilesdir}/munge.conf
sed -i 's/USER="munge"/USER="%munge_u"/g' %{buildroot}/%{_initrddir}/%{name}
- %{__ln_s} -f %{_initrddir}/%{name} %{buildroot}%{_sbindir}/rc%{name}
+ ln -s -f %{_initrddir}/%{name} %{buildroot}%{_sbindir}/rc%{name}
+ install -m 0755 -d %{buildroot}%{_fillupdir}
+ cp -p %{S:2} %{buildroot}%{_fillupdir}/sysconfig.munge
%else
sed -i 's/User=munge/User=%munge_u/g' %{buildroot}%{_unitdir}/munge.service
sed -i 's/Group=munge/Group=%munge_g/g' %{buildroot}%{_unitdir}/munge.service
@@ -183,10 +182,16 @@
%{fillup_and_insserv -i munge}
%endif
+%if 0%{?sle_version} > 120200 || 0%{?suse_version} > 1320
+%define mylicense %license
+%else
+%define mylicense %doc
+%endif
+
%files
%defattr(-,root,root,0755)
%doc AUTHORS
-%doc COPYING
+%mylicense COPYING
%doc DISCLAIMER*
%doc HISTORY
%doc JARGON
@@ -203,11 +208,11 @@
%{_bindir}/*
%{_sbindir}/*
%{_mandir}/*[^3]/*
-%{_fillupdir}/sysconfig.munge
%if 0%{?have_systemd}
%{_unitdir}/munge.service
%{_tmpfilesdir}/munge.conf
%else
+%{_fillupdir}/sysconfig.munge
%attr(0755,%munge_u,%munge_g) %dir %{_localstatedir}/run/%{name}
%{_initddir}/munge
%endif
