Hello community,
here is the log from the commit of package diod for openSUSE:Factory checked in
at 2020-11-26 23:15:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/diod (Old)
and /work/SRC/openSUSE:Factory/.diod.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diod"
Thu Nov 26 23:15:22 2020 rev:2 rq:850964 version:1.0.24+53.g0d87511
Changes:
--------
--- /work/SRC/openSUSE:Factory/diod/diod.changes 2020-01-20
22:57:51.303399406 +0100
+++ /work/SRC/openSUSE:Factory/.diod.new.5913/diod.changes 2020-11-26
23:16:13.861076606 +0100
@@ -1,0 +2,5 @@
+Tue Nov 17 13:57:58 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ diod.spec ++++++
--- /var/tmp/diff_new_pack.FVySHM/_old 2020-11-26 23:16:14.581077165 +0100
+++ /var/tmp/diff_new_pack.FVySHM/_new 2020-11-26 23:16:14.585077169 +0100
@@ -1,7 +1,7 @@
#
# spec file for package diod
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -56,8 +56,10 @@
mv %{buildroot}%{_sbindir}/diodmount %{buildroot}%{_sbindir}/mount.diod
mv %{buildroot}%{_mandir}/man8/diodmount.8
%{buildroot}%{_mandir}/man8/mount.diod.8
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdiod
+%if !0%{?usrmerged}
mkdir %{buildroot}/sbin
ln -s %{_sbindir}/mount.diod %{buildroot}/sbin/mount.diod
+%endif
%pre
%service_add_pre diod.service
@@ -75,7 +77,9 @@
%license COPYING
%doc README.md AUTHORS NEWS
+%if !0%{?usrmerged}
/sbin/*
+%endif
%{_sbindir}/*
%{_unitdir}/diod.service
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
