File project.diff of Package venv-salt-minion

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package venv-salt-minion (Revision e784cce61ad4a8a1ba6e4168bfb0cf50)

Currently displaying revision e784cce61ad4a8a1ba6e4168bfb0cf50 , Show latest

--- venv-salt-minion.spec.orig
+++ venv-salt-minion.spec
@@ -350,6 +350,9 @@ Patch95:        update-__pillar__-during
 ### IMPORTANT: The line below is used as a snippet marker. Do not touch it.
 ### SALT PATCHES LIST END
 
+# TEST PATCH: Suppress some DeprecationWarnings
+Patch1000:      test-patch-suppress-some-DeprecationWarnings.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  binutils
 BuildRequires:  fdupes
@@ -419,12 +422,18 @@ BuildRequires:  saltbundlepy-apt
 
 %if 0%{?suse_version}
 # required for zypper.py
+%if 0%{?suse_version} != 1110
 Requires(pre):  libzypp(plugin:system) >= 0
+%endif
 BuildRequires:  saltbundlepy-zypp-plugin
 # required for virtualisation hosts (libvirt)
+%if 0%{?suse_version} != 1110
 BuildRequires:  saltbundlepy-libvirt
 %endif
+%endif
+%if 0%{?suse_version} != 1110
 BuildRequires:  saltbundlepy-docker
+%endif
 BuildRequires:  saltbundlepy-pip
 
 %if "%_vendor" == "debbuild"
@@ -432,7 +441,9 @@ BuildRequires:  debbuild-macros
 Requires:       gnupg
 %endif
 Requires:       logrotate
+%if 0%{?suse_version} != 1110
 Requires:       systemd
+%endif
 
 %if "%_vendor" == "debbuild"
 AutoReqProv:    0
@@ -478,6 +489,24 @@ The testsuite for running inside virtual
 %prep
 %autosetup -n salt-%{version}-suse -p1
 
+cp %{S:10} %{S:11} %{S:12} .
+
+%if 0%{?rhel} == 8
+# Include libffi binary library to the bundle for EL8 distros
+echo "saltbundle-libffi7.rpm\$" >> include-rpm
+# Filter out libffi from the dependencies
+sed -i -E 's# /libzmq.so/d;# /libzmq.so/d; /libffi.so/d;#' %{S:101}
+%endif
+%if 0%{?suse_version} == 1110
+# Include libffi, libyaml and ssl related files to the bundle for SLE11
+echo "libffi43.rpm\$" >> include-rpm
+echo "libyaml-0-2.rpm\$" >> include-rpm
+echo "saltbundle-libopenssl1_0_0.rpm\$" >> include-rpm
+# Filter out libffi, libyaml and ssl related libraries from the dependencies
+# as these libraries should be included to the bundle for SLE11
+sed -i -r 's# /libzmq.so/d;# /libzmq.so/d; /libffi.so/d; /libyaml-0.so/d; /libcrypto.so/d; /libssl.so/d;#' %{S:101}
+%endif
+
 # Expand SELinux policy files
 tar zxvf %{S:200}
 
@@ -489,7 +518,6 @@ export PATH=/usr/bin:$PATH
 %{__saltbundlepy} setup.py --with-salt-version=%{version} --salt-transport=both build
 
 %install
-cp %{S:10} %{S:11} %{S:12} .
 venvjail create %{venv} \
 %if "%_vendor" == "debbuild"
   -i include-deb \
@@ -570,6 +598,7 @@ cp %{S:13} %{buildroot}%{salt_venv}%{ven
 # Copy venv-exec wrapper script
 cp %{S:14} %{buildroot}%{salt_venv}%{venv}/bin/venv-startup
 
+%if 0%{?suse_version} != 1110
 # Create systemd service file: venv-salt-minion.service
 %if 0%{?suse_version}
 install -Dpm 0644 pkg/old/suse/salt-minion.service %{buildroot}%{_unitdir}/venv-salt-minion.service
@@ -581,6 +610,15 @@ sed -i 's/^After=.*/After=network.target
 
 install -Dd -m 0755 %{buildroot}%{_sbindir}
 ln -s service %{buildroot}%{_sbindir}/rcvenv-salt-minion
+%else
+# For SLE11
+install -Dpm 0755 pkg/old/suse/salt-minion %{buildroot}%{_initddir}/venv-salt-minion
+sed -i -r 's#salt-minion#venv-salt-minion#g' %{buildroot}%{_initddir}/venv-salt-minion
+sed -i -r 's#salt-daemon-watcher#venv-salt-daemon-watcher#g' %{buildroot}%{_initddir}/venv-salt-minion
+install -Dd -m 0755 %{buildroot}%{_sbindir}
+ln -s %{_initddir}/venv-salt-minion %{buildroot}%{_sbindir}/rcvenv-salt-minion
+install -Dpm 0755 scripts/suse/watchdog/salt-daemon-watcher %{buildroot}%{_bindir}/venv-salt-daemon-watcher
+%endif
 
 install -Dd -m 0750 %{buildroot}%{_sysconfdir}/%{venv}/minion.d
 install -Dd -m 0750 %{buildroot}%{_sysconfdir}/%{venv}/pki/minion
@@ -614,12 +652,14 @@ cat <<EOF > "%{buildroot}%{_sysconfdir}/
 }
 EOF
 
+%if 0%{?suse_version} != 1110
 mkdir -p "%{buildroot}/usr/lib/tmpfiles.d"
 cat <<EOF > "%{buildroot}/usr/lib/tmpfiles.d/venv-salt-minion.conf"
 # Type Path                         Mode UID  GID     Age Argument
 d      /run/venv-salt-minion        0750 root root
 
 EOF
+%endif
 
 mkdir -p "%{buildroot}/var/cache/%{venv}"
 
@@ -643,7 +683,13 @@ find %{buildroot}%{salt_venv}%{venv} -na
 install -Dd -m 0750 %{buildroot}%{_prefix}/lib/zypp/plugins/commit
 %{__install} scripts/suse/zypper/plugins/commit/zyppnotify %{buildroot}%{_prefix}/lib/zypp/plugins/commit/venv-zyppnotify
 sed -i '1s=^#!/usr/bin/$python\|env python$[0-9.]*=#!%{salt_venv}%{venv}/bin/python=' %{buildroot}%{_prefix}/lib/zypp/plugins/commit/venv-zyppnotify
-sed -i -E 's#self.ck_path = ".*#self.ck_path = "/var/cache/%{venv}/rpmdb.cookie"#' \
+sed -i \
+%if 0%{?suse_version} == 1110
+    -r \
+%else
+    -E \
+%endif
+    's#self.ck_path = ".*#self.ck_path = "/var/cache/%{venv}/rpmdb.cookie"#' \
     %{buildroot}%{_prefix}/lib/zypp/plugins/commit/venv-zyppnotify
 %endif
 
@@ -712,7 +758,7 @@ find "%{buildroot}%{salt_venv}%{venv}" -
 done
 
 %pre
-%if 0%{?suse_version}
+%if 0%{?suse_version} != 1110
 %service_add_pre venv-salt-minion.service
 %endif
 
@@ -734,25 +780,31 @@ fi;
 update-alternatives --install /usr/bin/salt-test salt-test /usr/lib/venv-salt-minion/bin/salt-test 311
 %endif
 
+%if 0%{?suse_version} != 1110
 %if 0%{?suse_version}
 %service_add_post venv-salt-minion.service
 %else
 %systemd_post venv-salt-minion.service
 %endif
+%endif
 
 %preun
+%if 0%{?suse_version} != 1110
 %if 0%{?suse_version}
 %service_del_preun venv-salt-minion.service
 %else
 %systemd_preun venv-salt-minion.service
 %endif
+%endif
 
 %postun
+%if 0%{?suse_version} != 1110
 %if 0%{?suse_version}
 %service_del_postun venv-salt-minion.service
 %else
 %systemd_postun_with_restart venv-salt-minion.service
 %endif
+%endif
 
 %if "%_vendor" == "debbuild"
 if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
@@ -822,6 +874,11 @@ update-alternatives --remove salt-test /
 
 # Install plugin only on SUSE machines
 %if 0%{?suse_version}
+%if 0%{?suse_version} == 1110
+%dir %{_prefix}/lib/zypp
+%dir %{_prefix}/lib/zypp/plugins
+%dir %{_prefix}/lib/zypp/plugins/commit
+%endif
 %{_prefix}/lib/zypp/plugins/commit/venv-zyppnotify
 %endif
 
@@ -843,10 +900,17 @@ update-alternatives --remove salt-test /
 /usr/bin/venv-dpkgnotify
 %endif
 
+%if 0%{?suse_version} == 1110
+%{_initddir}/venv-salt-minion
+%{_bindir}/venv-salt-daemon-watcher
+%else
 %{_unitdir}/venv-salt-minion.service
+%endif
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/venv-salt-minion
+%if 0%{?suse_version} != 1110
 %{_prefix}/lib/tmpfiles.d/venv-salt-minion.conf
+%endif
 
 %if %{with salt_bundle_testsuite}
 %files testsuite

Places

File project.diff of Package venv-salt-minion (Revision e784cce61ad4a8a1ba6e4168bfb0cf50)

Places