Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package google-guest-configs for
openSUSE:Factory checked in at 2021-09-02 23:20:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-guest-configs (Old)
and /work/SRC/openSUSE:Factory/.google-guest-configs.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-guest-configs"
Thu Sep 2 23:20:31 2021 rev:5 rq:916053 version:20210702.00
Changes:
--------
---
/work/SRC/openSUSE:Factory/google-guest-configs/google-guest-configs.changes
2021-07-20 15:39:58.241526743 +0200
+++
/work/SRC/openSUSE:Factory/.google-guest-configs.new.1899/google-guest-configs.changes
2021-09-02 23:20:59.692604352 +0200
@@ -1,0 +2,6 @@
+Fri Aug 20 19:59:07 UTC 2021 - Callum Farmer <gm...@opensuse.org>
+
+- Use %_modprobedir for modprobe.d files (out of /etc)
+- Use %_sysctldir for sysctl.d files (out of /etc)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-guest-configs.spec ++++++
--- /var/tmp/diff_new_pack.OCyfNE/_old 2021-09-02 23:21:00.132604902 +0200
+++ /var/tmp/diff_new_pack.OCyfNE/_new 2021-09-02 23:21:00.132604902 +0200
@@ -15,7 +15,10 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300
+# systemd-rpm-macros(or kmod) is wrong in 15.2
+%define _modprobedir /lib/modprobe.d
+%endif
Name: google-guest-configs
Version: 20210702.00
Release: 0
@@ -23,13 +26,11 @@
License: Apache-2.0
Group: System/Daemons
URL: https://github.com/GoogleCloudPlatform/guest-configs
-Source0: %{name}-%{version}.tar.gz
+Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: systemd-rpm-macros
%if 0%{?suse_version} && 0%{?suse_version} <= 1315
BuildRequires: pkgconfig(udev)
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
BuildArch: noarch
%description
@@ -42,12 +43,12 @@
# Nothing to build
%install
-mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
-cp -av src/etc/modprobe.d/* %{buildroot}%{_sysconfdir}/modprobe.d/
+mkdir -p %{buildroot}%{_modprobedir}
+cp -av src/etc/modprobe.d/* %{buildroot}%{_modprobedir}
mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d
cp -av src/etc/rsyslog.d/* %{buildroot}%{_sysconfdir}/rsyslog.d/
-mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d
-cp -av src/etc/sysctl.d/* %{buildroot}%{_sysconfdir}/sysctl.d/
+mkdir -p %{buildroot}%{_sysctldir}
+cp -av src/etc/sysctl.d/* %{buildroot}%{_sysctldir}
mkdir -p %{buildroot}%{_udevrulesdir}
cp -av src/lib/udev/rules.d/* %{buildroot}%{_udevrulesdir}/
mkdir -p %{buildroot}%{_bindir}
@@ -60,12 +61,13 @@
%attr(0755,root,root) %{_bindir}/google_optimize_local_ssd
%exclude %attr(0755,root,root) %{_bindir}/google_set_hostname
%attr(0755,root,root) %{_bindir}/google_set_multiqueue
-%dir %{_sysconfdir}/modprobe.d
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300
+%dir %{_modprobedir}
+%endif
%dir %{_sysconfdir}/rsyslog.d
-%dir %{_sysconfdir}/sysctl.d
-%config %{_sysconfdir}/modprobe.d/gce-blacklist.conf
+%{_modprobedir}/gce-blacklist.conf
%config %{_sysconfdir}/rsyslog.d/*
-%config %{_sysconfdir}/sysctl.d/*
+%{_sysctldir}/*
%{_bindir}/*
%{_udevrulesdir}/*
