Hello community,
here is the log from the commit of package google-compute-engine for
openSUSE:Factory checked in at 2018-12-04 20:55:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-compute-engine (Old)
and /work/SRC/openSUSE:Factory/.google-compute-engine.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-compute-engine"
Tue Dec 4 20:55:53 2018 rev:11 rq:653629 version:20181011
Changes:
--------
---
/work/SRC/openSUSE:Factory/google-compute-engine/google-compute-engine.changes
2018-10-15 09:43:01.327397198 +0200
+++
/work/SRC/openSUSE:Factory/.google-compute-engine.new.19453/google-compute-engine.changes
2018-12-04 20:56:19.356719762 +0100
@@ -1,0 +2,11 @@
+Sun Nov 25 18:06:59 UTC 2018 - Robert Schweikert <[email protected]>
+
+- Remove conditions for distributions older than Leap 42.3 and SLE 12
+ + Delete init scripts google-accounts-daemon.suse,
+ google-clock-skew-daemon.suse, google-instance-setup.suse,
+ google-network-daemon.suse, google-shutdown-scripts.suse,
+ google-startup-scripts.suse
+- Fix build for distributions with gcc version less than 4.9
+ + Add new dependency on boost
+
+-------------------------------------------------------------------
Old:
----
google-accounts-daemon.suse
google-clock-skew-daemon.suse
google-instance-setup.suse
google-network-daemon.suse
google-shutdown-scripts.suse
google-startup-scripts.suse
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-compute-engine.spec ++++++
--- /var/tmp/diff_new_pack.ff6AVG/_old 2018-12-04 20:56:19.804719268 +0100
+++ /var/tmp/diff_new_pack.ff6AVG/_new 2018-12-04 20:56:19.808719264 +0100
@@ -12,7 +12,7 @@
# 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/
#
@@ -26,12 +26,6 @@
Group: System/Daemons
Url: https://github.com/GoogleCloudPlatform/compute-image-packages
Source0: compute-image-packages-%{version}.tar.gz
-Source1: google-accounts-daemon.suse
-Source2: google-clock-skew-daemon.suse
-Source3: google-instance-setup.suse
-Source4: google-network-daemon.suse
-Source5: google-shutdown-scripts.suse
-Source6: google-startup-scripts.suse
Source7: google-compute-engine-rpmlintrc
Source8: baselibs.conf
Patch1: gcei-hide-py-deps.patch
@@ -52,26 +46,15 @@
%else
Requires: python-setuptools
%endif
-%if 0%{?suse_version} > 1140
-Recommends: google-cloud-sdk
Requires: systemd
-%endif
%{?systemd_requires}
-%if 0%{?suse_version} < 1140
-Requires: insserv
-Requires: sysvinit
-%endif
%if 0%{?suse_version} && 0%{?suse_version} > 1315
BuildRequires: python3-distro
BuildRequires: python3-setuptools
%else
BuildRequires: python-setuptools
%endif
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
BuildArch: noarch
-%endif
%if 0%{?suse_version} && 0%{?suse_version} <= 1315
# These packages were not released in SLE 15 and later, thus no conflict needed
Conflicts: google-startup-scripts
@@ -89,6 +72,9 @@
Requires: pam
Requires(post): openssh
Requires(post): glibc
+%if 0%{?suse_version} && 0%{?suse_version} <= 1315
+BuildRequires: boost-devel
+%endif
BuildRequires: gcc-c++
BuildRequires: libcurl-devel
BuildRequires: libjson-c-devel
@@ -114,7 +100,11 @@
python setup.py build
%endif
pushd google_compute_engine_oslogin
-make %{?_smp_mflags} LIBS="-lcurl -ljson-c"
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+make %{?_smp_mflags}
+%else
+make %{?_smp_mflags} LIBS='-lcurl -ljson-c -lboost_regex'
+%endif
popd
%install
@@ -125,31 +115,15 @@
%endif
mkdir -p %{buildroot}%{_sbindir}
# Init
-%if 0%{?suse_version} > 1140
mkdir -p %{buildroot}%{_unitdir}
cp google_compute_engine_init/systemd/*.service %{buildroot}%{_unitdir}
for srv_name in %{buildroot}%{_unitdir}/*.service; do rc_name=$(basename -s
'.service' $srv_name); ln -s service %{buildroot}%{_sbindir}/rc$rc_name; done
-%else
-mkdir -p %{buildroot}%{_initddir}
-cp %{SOURCE1} %{buildroot}%{_initddir}/google-accounts-daemon
-cp %{SOURCE2} %{buildroot}%{_initddir}/google-clock-skew-daemon
-cp %{SOURCE3} %{buildroot}%{_initddir}/google-instance-setup
-cp %{SOURCE4} %{buildroot}%{_initddir}/google-network-daemon
-cp %{SOURCE5} %{buildroot}%{_initddir}/google-shutdown-scripts
-cp %{SOURCE6} %{buildroot}%{_initddir}/google-startup-scripts
-for srv_name in %{buildroot}%{_initddir}/*; do rc_name=$(basename $srv_name);
ln -s %{_initddir}/$rc_name %{buildroot}%{_sbindir}/rc$rc_name; done
-%endif
# Sysconfig
mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d
cp google_config/sysctl/11-gce-network-security.conf
%{buildroot}%{_sysconfdir}/sysctl.d
# udev
-%if 0%{?suse_version} < 1230
-mkdir -p %{buildroot}/lib/udev/rules.d
-cp google_config/udev/* %{buildroot}/lib/udev/rules.d
-%else
mkdir -p %{buildroot}/usr/lib/udev/rules.d
cp google_config/udev/* %{buildroot}/usr/lib/udev/rules.d
-%endif
# syslog
mkdir %{buildroot}/%{_sysconfdir}/rsyslog.d
cp google_config/rsyslog/* %{buildroot}/%{_sysconfdir}/rsyslog.d
@@ -162,12 +136,9 @@
cp google_config/modprobe/gce-blacklist.conf
%{buildroot}/%{_sysconfdir}/modprobe.d/
%pre init
-%if 0%{?suse_version} > 1140
%service_add_pre google-accounts-daemon.service
google-clock-skew-daemon.service google-instance-setup.service
google-network-daemon.service google-shutdown-scripts.service
google-startup-scripts.service
-%endif
%post init
-%if 0%{?suse_version} > 1140
%service_add_post google-accounts-daemon.service
google-clock-skew-daemon.service google-instance-setup.service
google-network-daemon.service google-shutdown-scripts.service
google-startup-scripts.service
if [ -f /usr/lib/systemd/system/google-ip-forwarding-daemon.service ];
then
systemctl stop --no-block google-ip-forwarding-daemon
@@ -183,47 +154,24 @@
systemctl enable google-network-daemon.service
systemctl start google-network-daemon.service
fi
-%else
- if [ "$1" == "2" ] && ! [ -e /.buildenv ]; then
- # "$1" == "2" means the package is being upgraded
- # ./buildenv is only present during package builds
- service google-network-daemon start
- fi
-
- %fillup_and_insserv -fy google-accounts-daemon
- %fillup_and_insserv -fy google-clock-skew-daemon
- %fillup_and_insserv -fy google-instance-setup
- %fillup_and_insserv -fy google-network-daemon
- %fillup_and_insserv -fy google-shutdown-scripts
- %fillup_and_insserv -fy google-startup-scripts
-%endif
%post oslogin
/sbin/ldconfig
%preun init
-%if 0%{?suse_version} > 1140
%service_del_preun google-accounts-daemon.service
google-clock-skew-daemon.service google-instance-setup.service
google-ip-forwarding-daemon.service google-network-daemon.service
google-shutdown-scripts.service google-startup-scripts.service
-%else
- %stop_on_removal google-accounts-daemon
- %stop_on_removal google-clock-skew-daemon
- %stop_on_removal google-ip-forwarding-daemon
-%endif
%postun init
%restart_on_update
-%if 0%{?suse_version} > 1140
%service_del_postun google-accounts-daemon.service
google-clock-skew-daemon.service google-instance-setup.service
google-ip-forwarding-daemon.service google-network-daemon.service
google-shutdown-scripts.service google-startup-scripts.service
-%else
- %insserv_cleanup
-%endif
%postun oslogin
/sbin/ldconfig
%files init
%defattr(0644,root,root,0755)
-%doc CONTRIB.md LICENSE README.md
+%doc CONTRIB.md README.md
+%license LICENSE
%if 0%{?suse_version} && 0%{?suse_version} > 1315
%dir %{python3_sitelib}/google_compute_engine
%dir
%{python3_sitelib}/google_compute_engine-%{setup_version}-py%{py3_ver}.egg-info
@@ -250,22 +198,11 @@
%else
%{python_sitelib}/google_compute_engine-%{setup_version}-py%{py_ver}.egg-info/*
%endif
-%if 0%{?suse_version} > 1140
%{_unitdir}/*.service
-%else
-%attr(0755,root,root) %{_initddir}/*
-%endif
%config %{_sysconfdir}/sysctl.d/*
-%if 0%{?suse_version} < 1230
-%dir %{_sysconfdir}/sysctl.d
-%dir /lib/udev
-%dir /lib/udev/rules.d
-/lib/udev/rules.d/*
-%else
%dir /usr/lib/udev
%dir /usr/lib/udev/rules.d
/usr/lib/udev/rules.d/*
-%endif
%dir %{_sysconfdir}/rsyslog.d
%dir %{_sysconfdir}/modprobe.d
%config %{_sysconfdir}/rsyslog.d/*
@@ -277,8 +214,6 @@
%attr(0755,root,root) %{_bindir}/google_authorized_keys
%attr(0755,root,root) %{_bindir}/google_oslogin_nss_cache
/%{_lib}/*
-%if 0%{?suse_version} > 1140
%exclude /%{_lib}/udev*
-%endif
%changelog
