From a8f280f24da20ed8572dd7b45301d868f81e5af98d87737306145ced7b0be37e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Thu, 16 Nov 2017 09:11:11 +0000 Subject: [PATCH] Accepting request 541865 from systemsmanagement:saltstack:products:unstable.py3 Fix service file for openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/541865 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=99 --- .gitattributes | 2 -- _service:extract_file:README.SUSE => README.SUSE | 0 _service | 6 +++--- _service:tar_scm:package-1510227540.833ce8accd.tar | 3 --- ...gfix-always-return-a-string-list-on-unknown-job-ta.patch | 0 ...able-with-salt-version-parameter-for-setup.py-scri.patch | 0 _service:extract_file:html.tar.bz2 => html.tar.bz2 | 0 ...troduce-process_count_max-minion-configuration-par.patch | 0 ...st_pkgs-add-parameter-for-returned-attribute-selec.patch | 0 ... multiprocessing-minion-option-documentation-fixes.patch | 0 ...xtract_file:salt-2017.7.2.tar.gz => salt-2017.7.2.tar.gz | 0 _service:extract_file:salt-tmpfiles.d => salt-tmpfiles.d | 0 _service:extract_file:salt.changes => salt.changes | 0 _service:extract_file:salt.spec => salt.spec | 2 -- _service:extract_file:travis.yml => travis.yml | 0 ..._file:update-documentation.sh => update-documentation.sh | 0 ...e-home-to-get-the-user-home-directory-instead-usin.patch | 0 _service:extract_file:zyppnotify => zyppnotify | 2 +- 18 files changed, 4 insertions(+), 11 deletions(-) rename _service:extract_file:README.SUSE => README.SUSE (100%) delete mode 100644 _service:tar_scm:package-1510227540.833ce8accd.tar rename _service:extract_file:bugfix-always-return-a-string-list-on-unknown-job-ta.patch => bugfix-always-return-a-string-list-on-unknown-job-ta.patch (100%) rename _service:extract_file:enable-with-salt-version-parameter-for-setup.py-scri.patch => enable-with-salt-version-parameter-for-setup.py-scri.patch (100%) rename _service:extract_file:html.tar.bz2 => html.tar.bz2 (100%) rename _service:extract_file:introduce-process_count_max-minion-configuration-par.patch => introduce-process_count_max-minion-configuration-par.patch (100%) rename _service:extract_file:list_pkgs-add-parameter-for-returned-attribute-selec.patch => list_pkgs-add-parameter-for-returned-attribute-selec.patch (100%) rename _service:extract_file:multiprocessing-minion-option-documentation-fixes.patch => multiprocessing-minion-option-documentation-fixes.patch (100%) rename _service:extract_file:salt-2017.7.2.tar.gz => salt-2017.7.2.tar.gz (100%) rename _service:extract_file:salt-tmpfiles.d => salt-tmpfiles.d (100%) rename _service:extract_file:salt.changes => salt.changes (100%) rename _service:extract_file:salt.spec => salt.spec (99%) rename _service:extract_file:travis.yml => travis.yml (100%) rename _service:extract_file:update-documentation.sh => update-documentation.sh (100%) rename _service:extract_file:use-home-to-get-the-user-home-directory-instead-usin.patch => use-home-to-get-the-user-home-directory-instead-usin.patch (100%) rename _service:extract_file:zyppnotify => zyppnotify (98%) diff --git a/.gitattributes b/.gitattributes index ac6f5e8..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,5 +21,3 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text -## Specific LFS patterns -_service:tar_scm:package-1510227540.833ce8accd.tar filter=lfs diff=lfs merge=lfs -text diff --git a/_service:extract_file:README.SUSE b/README.SUSE similarity index 100% rename from _service:extract_file:README.SUSE rename to README.SUSE diff --git a/_service b/_service index 3009a76..0a766ae 100644 --- a/_service +++ b/_service @@ -1,19 +1,19 @@ - + git https://github.com/opensuse/salt.git .git package openSUSE-2017.7.2-python3-only - + *package*.tar */obs/* */scripts/suse/zypper/plugins/commit/zyppnotify - + _service:extract_file:salt-2017.7.2.tar.gz sha256 ff3bc7de5abf01b8acbd144db5811b00867179b2353f5c6f7f19241e2eff2840 diff --git a/_service:tar_scm:package-1510227540.833ce8accd.tar b/_service:tar_scm:package-1510227540.833ce8accd.tar deleted file mode 100644 index 77bd33c..0000000 --- a/_service:tar_scm:package-1510227540.833ce8accd.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:015fd10afd3c52128ee5e9d861df10e04fff8c76053ba3fb118187c034e9e2d5 -size 67747840 diff --git a/_service:extract_file:bugfix-always-return-a-string-list-on-unknown-job-ta.patch b/bugfix-always-return-a-string-list-on-unknown-job-ta.patch similarity index 100% rename from _service:extract_file:bugfix-always-return-a-string-list-on-unknown-job-ta.patch rename to bugfix-always-return-a-string-list-on-unknown-job-ta.patch diff --git a/_service:extract_file:enable-with-salt-version-parameter-for-setup.py-scri.patch b/enable-with-salt-version-parameter-for-setup.py-scri.patch similarity index 100% rename from _service:extract_file:enable-with-salt-version-parameter-for-setup.py-scri.patch rename to enable-with-salt-version-parameter-for-setup.py-scri.patch diff --git a/_service:extract_file:html.tar.bz2 b/html.tar.bz2 similarity index 100% rename from _service:extract_file:html.tar.bz2 rename to html.tar.bz2 diff --git a/_service:extract_file:introduce-process_count_max-minion-configuration-par.patch b/introduce-process_count_max-minion-configuration-par.patch similarity index 100% rename from _service:extract_file:introduce-process_count_max-minion-configuration-par.patch rename to introduce-process_count_max-minion-configuration-par.patch diff --git a/_service:extract_file:list_pkgs-add-parameter-for-returned-attribute-selec.patch b/list_pkgs-add-parameter-for-returned-attribute-selec.patch similarity index 100% rename from _service:extract_file:list_pkgs-add-parameter-for-returned-attribute-selec.patch rename to list_pkgs-add-parameter-for-returned-attribute-selec.patch diff --git a/_service:extract_file:multiprocessing-minion-option-documentation-fixes.patch b/multiprocessing-minion-option-documentation-fixes.patch similarity index 100% rename from _service:extract_file:multiprocessing-minion-option-documentation-fixes.patch rename to multiprocessing-minion-option-documentation-fixes.patch diff --git a/_service:extract_file:salt-2017.7.2.tar.gz b/salt-2017.7.2.tar.gz similarity index 100% rename from _service:extract_file:salt-2017.7.2.tar.gz rename to salt-2017.7.2.tar.gz diff --git a/_service:extract_file:salt-tmpfiles.d b/salt-tmpfiles.d similarity index 100% rename from _service:extract_file:salt-tmpfiles.d rename to salt-tmpfiles.d diff --git a/_service:extract_file:salt.changes b/salt.changes similarity index 100% rename from _service:extract_file:salt.changes rename to salt.changes diff --git a/_service:extract_file:salt.spec b/salt.spec similarity index 99% rename from _service:extract_file:salt.spec rename to salt.spec index bb17c17..73b84d7 100644 --- a/_service:extract_file:salt.spec +++ b/salt.spec @@ -69,7 +69,6 @@ BuildRequires: python3-jinja2 %else BuildRequires: python3-Jinja2 %endif -BuildRequires: python3-futures >= 2.0 BuildRequires: python3-MarkupSafe BuildRequires: python3-msgpack-python > 0.3 BuildRequires: python3-psutil @@ -128,7 +127,6 @@ Requires: yum-plugin-security %else Requires: python3-Jinja2 %endif -Requires: python3-futures >= 2.0 Requires: python3-MarkupSafe Requires: python3-msgpack-python > 0.3 Requires: python3-psutil diff --git a/_service:extract_file:travis.yml b/travis.yml similarity index 100% rename from _service:extract_file:travis.yml rename to travis.yml diff --git a/_service:extract_file:update-documentation.sh b/update-documentation.sh similarity index 100% rename from _service:extract_file:update-documentation.sh rename to update-documentation.sh diff --git a/_service:extract_file:use-home-to-get-the-user-home-directory-instead-usin.patch b/use-home-to-get-the-user-home-directory-instead-usin.patch similarity index 100% rename from _service:extract_file:use-home-to-get-the-user-home-directory-instead-usin.patch rename to use-home-to-get-the-user-home-directory-instead-usin.patch diff --git a/_service:extract_file:zyppnotify b/zyppnotify similarity index 98% rename from _service:extract_file:zyppnotify rename to zyppnotify index e3f19a4..c548ac4 100644 --- a/_service:extract_file:zyppnotify +++ b/zyppnotify @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Copyright (c) 2016 SUSE Linux LLC # All Rights Reserved.