New release

diff --git a/RELEASE b/RELEASE
index d00491fd7e5bb6fa28c517a0bb32b8b506539d4d..0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1
+2

diff --git a/Scratch3.sls b/Scratch3.sls
index f452394d221ea267da19652f54cab85295eee274..112c787c3a4d8faf16c117e1b8fa389ef52ee799 100644 (file)
--- 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 d2f7dd37eb98bd5e4250ecc8fd4cf64f7bfc9d19..522444f3db98d90b0267360c3978ad7b0c4606ab 100644 (file)
--- 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)