From a201eaab5a82daab0d457744ed530dbe1e0a6826 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 23 Jun 2021 13:10:24 +0200 Subject: [PATCH] New release --- RELEASE | 2 +- Scratch3.sls | 6 ++++++ oss-pkg-Scratch3.spec.in | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/RELEASE b/RELEASE index d00491f..0cfbf08 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -1 +2 diff --git a/Scratch3.sls b/Scratch3.sls index f452394..112c787 100644 --- a/Scratch3.sls +++ b/Scratch3.sls @@ -10,5 +10,11 @@ PACKAGE: pkg: - installed + - require: + - preinstalled + +preinstalled: + pkg.installed: + - name: AdobeAIR diff --git a/oss-pkg-Scratch3.spec.in b/oss-pkg-Scratch3.spec.in index d2f7dd3..522444f 100644 --- a/oss-pkg-Scratch3.spec.in +++ b/oss-pkg-Scratch3.spec.in @@ -15,6 +15,7 @@ Source: %{name}.tar.bz2 BuildArch: noarch BuildRequires:unzip #Requires: +Requires: oss-pkg-AdobeAIR Requires: filesystem PreReq: salt-master PreReq: %fillup_prereq @@ -50,7 +51,7 @@ rm -rf %{buildroot} /usr/sbin/oss_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/PACKAGE/HASH.json sleep 1 -/usr/sbin/oss_api.sh POST 'softwares/addRequirements' '["PACAKGE","AdobeAIR"]' +/usr/sbin/crx_api.sh POST 'softwares/addRequirements' '["PACAKGE","AdobeAIR"]' %files %defattr(644,root,root) -- 2.43.0