♻️ update to version 22.01

diff --git a/7zip.sls b/7zip.sls
index f452394d221ea267da19652f54cab85295eee274..6a12b68b992a737990ec76f9089ce8a93cc3838c 100644 (file)
--- a/7zip.sls
+++ b/7zip.sls
@@ -1,11 +1,11 @@
 ###############################################################################
 # SLS: PACKAGE
-# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
+# Copyright (c) 2023 Helmuth Varkoly, Nuermberg, Germany.
 # All rights reserved.
 #
-# Author:               Helmuth Varkoly
+# Author:               Helmuth Varkoly, Maximilian Grunow
 #
-# Description:          SLS to use with OSS's softwaremanagement              
+# Description:          SLS to use with Cranix's softwaremanagement              
 ###############################################################################
 PACKAGE:
   pkg:

diff --git a/FULLNAMES b/FULLNAMES
index c8807129ddc66aff5b1a247dce38abdac7a5b198..117cb2f1a36e3f52708a39564b7e3e57dec85b42 100644 (file)
--- a/FULLNAMES
+++ b/FULLNAMES
@@ -1,2 +1,2 @@
-7-Zip 16.04 (x64 edition)
-7-Zip 16.04
+7-Zip 22.01 (x64 edition)
+7-Zip 22.01

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 f3a8e9212a3149f4d0c030d4a66cf7f9e8124917..898fef801e71c627d83310e9c5aed522bd200102 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:
@@ -22,7 +22,7 @@ package:
        rm -rf oss-pkg-$(PACKAGE)
        mv  oss-pkg-$(PACKAGE).tar.bz2  /usr/src/packages/SOURCES/
        rpmbuild -bb oss-pkg-$(PACKAGE).spec
-       for i in $(REPO)/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm; do test -e $$i && rm $$i; done
+       find $(REPO)/noarch -name "oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm"  -exec rm {} \;
        mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch
        echo $(NRELEASE) > RELEASE
        git commit -a -m "New release"

diff --git a/VERSION b/VERSION
index 63e240b9fa82c514361252c657ec489f7706a188..d9b518bcf2bbf040c48915b65e4a1cd98f8f1896 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-19.00.00.0
+22.01

diff --git a/oss-pkg-7zip.spec.in b/oss-pkg-7zip.spec.in
index cd3e3f74e3b4a84dffd7a18de967e6f8c9d93930..7189150f7ee4589d944fd7625f5831c6786636f4 100644 (file)
--- a/oss-pkg-7zip.spec.in
+++ b/oss-pkg-7zip.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
@@ -21,12 +21,13 @@ PreReq:       %fillup_prereq
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
-Package to install PACKAGE on OSS-Clients
+Package to install PACKAGE on Cranix-Clients
 
 Authors:
 --------
         helmuth@varkoly.de
         peter@varkoly.de
+        maximilian@grunow.at
 
 
 %prep

diff --git a/repo-ng/7z1900-x64.msi b/repo-ng/7z1900-x64.msi
deleted file mode 100755 (executable)
index 99ee624..0000000
Binary files a/repo-ng/7z1900-x64.msi and /dev/null differ

diff --git a/repo-ng/7z1900.msi b/repo-ng/7z1900.msi
deleted file mode 100755 (executable)
index d93ff38..0000000
Binary files a/repo-ng/7z1900.msi and /dev/null differ

diff --git a/repo-ng/7z2201-x64.msi b/repo-ng/7z2201-x64.msi
new file mode 100644 (file)
index 0000000..569681b
Binary files /dev/null and b/repo-ng/7z2201-x64.msi differ

diff --git a/repo-ng/7z2201.msi b/repo-ng/7z2201.msi
new file mode 100644 (file)
index 0000000..762dd8f
Binary files /dev/null and b/repo-ng/7z2201.msi differ

diff --git a/repo-ng/init.sls b/repo-ng/init.sls
index 1b30f79159b0e6c96fdc5f0179a9bd93c2c50ae4..6e79a91a7570660af4ee2f8ee1a586091d084bb0 100755 (executable)
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -1,9 +1,9 @@
 ###############################################################################
 # SLS: 7zip
-# 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
 ###############################################################################
@@ -17,15 +17,15 @@
 {% set LOG_PATH = 'C:\\salt\\var\\log' %}
 
 7zip:
-  '19.00.00.0':
+  '22.01':
     {% if ARCH == 'x64' %}
-    installer: salt://win/repo-ng/7zip/7z1900-x64.msi
-    uninstaller: salt://win/repo-ng/7zip/7z1900-x64.msi
-    full_name: '7-Zip 19.00 (x64 edition)'
+    installer: salt://win/repo-ng/7zip/7z2201-x64.msi
+    uninstaller: salt://win/repo-ng/7zip/7z2201-x64.msi
+    full_name: '7-Zip 22.01 (x64 edition)'
     {% else %}
-    full_name: '7-Zip 19.00'
-    installer: salt://win/repo-ng/7zip/7z1900.msi
-    uninstaller: salt://win/repo-ng/7zip/7z1900.msi
+    full_name: '7-Zip 22.01'
+    installer: salt://win/repo-ng/7zip/7z2201.msi
+    uninstaller: salt://win/repo-ng/7zip/7z2201.msi
     {% endif %}
     install_flags: '/quiet /log "{{ LOG_PATH }}\7zip_inst.log"'
     uninstall_flags: '/quiet /log "{{ LOG_PATH }}\7zip_uninst.log"'