diff --git a/_lastrevision b/_lastrevision index 30bce50..5e9604c 100644 --- a/_lastrevision +++ b/_lastrevision @@ -1 +1 @@ -ea5a745c3a962219fd886eefc19f33997b655283 \ No newline at end of file +6ea034113af0bc6f97110175d633bdf951af0fcd \ No newline at end of file diff --git a/add-ppc64le-as-a-valid-rpm-package-architecture.patch b/add-ppc64le-as-a-valid-rpm-package-architecture.patch new file mode 100644 index 0000000..97414c3 --- /dev/null +++ b/add-ppc64le-as-a-valid-rpm-package-architecture.patch @@ -0,0 +1,27 @@ +From aa9df9a08aa2a761cd91d91376a6a7dfa820c48f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= + +Date: Fri, 24 May 2019 16:27:07 +0100 +Subject: [PATCH] Add 'ppc64le' as a valid RPM package architecture + +--- + salt/utils/pkg/rpm.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/salt/utils/pkg/rpm.py b/salt/utils/pkg/rpm.py +index 828b0cecda..cb85eb99fe 100644 +--- a/salt/utils/pkg/rpm.py ++++ b/salt/utils/pkg/rpm.py +@@ -21,7 +21,7 @@ log = logging.getLogger(__name__) + # These arches compiled from the rpmUtils.arch python module source + ARCHES_64 = ('x86_64', 'athlon', 'amd64', 'ia32e', 'ia64', 'geode') + ARCHES_32 = ('i386', 'i486', 'i586', 'i686') +-ARCHES_PPC = ('ppc', 'ppc64', 'ppc64iseries', 'ppc64pseries') ++ARCHES_PPC = ('ppc', 'ppc64', 'ppc64le', 'ppc64iseries', 'ppc64pseries') + ARCHES_S390 = ('s390', 's390x') + ARCHES_SPARC = ( + 'sparc', 'sparcv8', 'sparcv9', 'sparcv9v', 'sparc64', 'sparc64v' +-- +2.17.1 + + diff --git a/add-standalone-configuration-file-for-enabling-packa.patch b/add-standalone-configuration-file-for-enabling-packa.patch new file mode 100644 index 0000000..6dfaadf --- /dev/null +++ b/add-standalone-configuration-file-for-enabling-packa.patch @@ -0,0 +1,26 @@ +From 74160010c0fdddb04980ad664e155550382ef82b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= + +Date: Wed, 22 May 2019 13:00:46 +0100 +Subject: [PATCH] Add standalone configuration file for enabling package + formulas + +--- + conf/suse/standalone-formulas-configuration.conf | 4 ++++ + 1 file changed, 4 insertions(+) + create mode 100644 conf/suse/standalone-formulas-configuration.conf + +diff --git a/conf/suse/standalone-formulas-configuration.conf b/conf/suse/standalone-formulas-configuration.conf +new file mode 100644 +index 0000000000..94d05fb2ee +--- /dev/null ++++ b/conf/suse/standalone-formulas-configuration.conf +@@ -0,0 +1,4 @@ ++file_roots: ++ base: ++ - /usr/share/salt-formulas/states ++ - /srv/salt +-- +2.17.1 + + diff --git a/salt.changes b/salt.changes index 22ec24b..2d4ff07 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri May 24 16:03:09 UTC 2019 - psuarezhernandez@suse.com + +- Fix return status when installing or updating RPM packages + with "ppc64le" arch (bsc#1133647) + +- Added: + * add-ppc64le-as-a-valid-rpm-package-architecture.patch + +------------------------------------------------------------------- +Thu May 23 08:27:52 UTC 2019 - psuarezhernandez@suse.com + +- Add new "salt-standalone-formulas-configuration" package + +- Added: + * add-standalone-configuration-file-for-enabling-packa.patch + ------------------------------------------------------------------- Mon May 20 12:12:46 UTC 2019 - psuarezhernandez@suse.com diff --git a/salt.spec b/salt.spec index ff1c0fa..2f8b144 100644 --- a/salt.spec +++ b/salt.spec @@ -176,6 +176,10 @@ Patch53: do-not-crash-when-there-are-ipv6-established-connect.patch Patch54: fix-async-batch-multiple-done-events.patch # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/52743 Patch55: switch-firewalld-state-to-use-change_interface.patch +# PATCH-FIX_OPENSUSE +Patch56: add-standalone-configuration-file-for-enabling-packa.patch +# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/53237 +Patch57: add-ppc64le-as-a-valid-rpm-package-architecture.patch # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -629,6 +633,18 @@ Zsh command line completion support for %{name}. %endif +%package standalone-formulas-configuration +Summary: Standalone Salt configuration to make the packaged formulas available for the Salt master +Group: System/Management +Requires: %{name} = %{version}-%{release} +Requires: %{name}-master = %{version}-%{release} +Provides: salt-formulas-configuration +Conflicts: otherproviders(salt-formulas-configuration) + +%description standalone-formulas-configuration +This package adds the standalone configuration for the Salt master in order to make the packaged Salt formulas available on the Salt master + + %prep # %setup -q -n salt-%{version} %setup -q -n salt-2019.2.0-suse @@ -689,6 +705,8 @@ cp %{S:5} ./.travis.yml %patch53 -p1 %patch54 -p1 %patch55 -p1 +%patch56 -p1 +%patch57 -p1 %build %if 0%{?build_py2} @@ -870,6 +888,12 @@ mkdir -p %{buildroot}%{fish_completions_dir} install -Dpm 0644 pkg/fish-completions/* %{buildroot}%{fish_completions_dir} %endif +# Standalone Salt formulas configuration +install -Dd -m 0750 %{buildroot}%{_prefix}/share/salt-formulas +install -Dd -m 0750 %{buildroot}%{_prefix}/share/salt-formulas/states +install -Dd -m 0750 %{buildroot}%{_prefix}/share/salt-formulas/metadata +install -Dpm 0640 conf/suse/standalone-formulas-configuration.conf %{buildroot}%{_sysconfdir}/salt/master.d + %if 0%{?suse_version} > 1020 %fdupes %{buildroot}%{_docdir} %if 0%{?build_py2} @@ -1400,6 +1424,13 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version %dir %{fish_dir} %endif +%files standalone-formulas-configuration +%defattr(-,root,root) +%config(noreplace) %attr(0640, root, root) %{_sysconfdir}/salt/master.d/standalone-formulas-configuration.conf +%dir %attr(0750, root, root) %{_prefix}/share/salt-formulas/ +%dir %attr(0750, root, root) %{_prefix}/share/salt-formulas/states/ +%dir %attr(0750, root, root) %{_prefix}/share/salt-formulas/metadata/ + %changelog