♻️ update to version 3.29.1

diff --git a/FULLNAMES b/FULLNAMES
index e4bf82f0496bcb0948c224c94ccdf53912c1dfc4..1d6ed4dac2cdd444b09d44278765d0dc07a2b5ed 100644 (file)
--- a/FULLNAMES
+++ b/FULLNAMES
@@ -1 +1 @@
-Scratch 3 3.21.0
+Scratch 3 3.29.1

diff --git a/LICENSE b/LICENSE
index c70fc0db0a1550ac33aa46a1388e2a32ad5bb17e..2423a30e2652783cde4cf462a7748f3ba99734f6 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1 +1 @@
-Copyright (c) 2017 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd.
\ No newline at end of file
+Copyright (c) 2023 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd.
\ No newline at end of file

diff --git a/Makefile b/Makefile
index 6035812e0b923a558228f999191f132ee3e51a08..6c221df0dc3e3e3f79302406f0c4d7b27a0b5378 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ REPO            = /srv/www/repo/salt-packages/
 VERSION         = $(shell cat VERSION )
 RELEASE         = $(shell cat RELEASE )
 NRELEASE        = $(shell echo $(RELEASE) + 1 | bc )
-YEAR           = $(shell date +%Y )
+YEAR                   = $(shell date +%Y )
 
 package:
        sed    s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in > oss-pkg-$(PACKAGE).spec

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

diff --git a/Scratch3.sls b/Scratch3.sls
index 112c787c3a4d8faf16c117e1b8fa389ef52ee799..b26cb4c5d822c524d3973bcefe90c87e70daacf0 100644 (file)
--- a/Scratch3.sls
+++ b/Scratch3.sls
@@ -1,20 +1,12 @@
 ###############################################################################
 # SLS: PACKAGE
-# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
+# Copyright (c) 2023 Helmuth Varkoly, Nuermberg, Germany.
 # All rights reserved.
 #
 # Author:               Helmuth Varkoly
 #
-# Description:          SLS to use with OSS's softwaremanagement              
+# Description:          SLS to use with Cranix's softwaremanagement              
 ###############################################################################
 PACKAGE:
   pkg:
     - installed
-    - require:
-      - preinstalled
-
-preinstalled:
-  pkg.installed:
-    - name: AdobeAIR
-
-

diff --git a/VERSION b/VERSION
index 6075c9a9ff9153b786b26b99ae1bd889f42ec4f9..1002be7fb71faf482969581b444c119860cb465a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.21.0
+3.29.1

diff --git a/oss-pkg-Scratch3.spec.in b/oss-pkg-Scratch3.spec.in
index 522444f3db98d90b0267360c3978ad7b0c4606ab..7580edacec8f205f5daa60ab14fb2685dbce4b22 100644 (file)
--- a/oss-pkg-Scratch3.spec.in
+++ b/oss-pkg-Scratch3.spec.in
@@ -4,7 +4,7 @@
 #
 
 Name:         oss-pkg-PACKAGE
-Summary:      Package to install PACKAGE on OSS-Clients
+Summary:      Package to install PACKAGE on Cranix-Clients
 Version:      VERSION
 Release:      RELEASE
 License:      GPL-2.0
@@ -22,7 +22,7 @@ PreReq:       %fillup_prereq
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
-Package to install PACKAGE on OSS-Clients
+Package to install PACKAGE on Cranix-Clients
 
 Authors:
 --------

diff --git a/repo-ng/Scratch_3.21_Setup.exe b/repo-ng/Scratch_3.29.1_Setup.exe
similarity index 87%
rename from repo-ng/Scratch_3.21_Setup.exe
rename to repo-ng/Scratch_3.29.1_Setup.exe
index 2100f4d2154dad0485ad97b48832f451ed9c1f59..7192df0f739a9ab795f23d7ca131c4860c3df241 100644 (file)
Binary files a/repo-ng/Scratch_3.21_Setup.exe and b/repo-ng/Scratch_3.29.1_Setup.exe differ

diff --git a/repo-ng/init.sls b/repo-ng/init.sls
index 23c85558d0fe9093df4b75ccb59dc4855ee1f08f..8c74ce4abeba825422bab0a95862e82e859f88c9 100644 (file)
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -1,26 +1,20 @@
 ###############################################################################
 # SLS: Scratch3
-# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
+# Copyright (c) 2023 Helmuth Varkoly, Nuermberg, Germany.
 # All rights reserved.
 #
-# Authors:              Helmuth Varkoly
+# Authors:              Helmuth Varkoly, Maximilian Grunow
 #
 # Description:          Package SLS
 ###############################################################################
 
-{% if grains['cpuarch'] == 'AMD64' %}
-{% set ARCH = "x64" %}
-{% else %}
-{% set ARCH = "x86" %}
-{% endif %}
-
 {% set LOG_PATH = 'C:\\salt\\var\\log' %}
 
 Scratch3:
-  '3.21.0':
-    installer: salt://win/repo-ng/Scratch3/Scratch_3.21_Setup.exe
+  '3.29.1':
+    installer: salt://win/repo-ng/Scratch3/Scratch_3.29.1_Setup.exe
     uninstaller: 'C:\Program Files (x86)\Scratch 3\Uninstall Scratch 3.exe'
-    full_name: 'Scratch 3 3.21.0'
+    full_name: 'Scratch 3 3.29.1'
     install_flags: '/allUsers /S'
     uninstall_flags: '/S'
     msiexec: False