♻️ update to version 23.001.20143

diff --git a/.gitignore b/.gitignore
index 7196bf71d9d72711ac110aae240a65dc0b0fc65b..f317f2c67d1113be32d9970a4bdbc2b5ce55bfae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 oss-pkg-AcroReaderDC.spec
+repo-ng/HASH.json

diff --git a/AcroReaderDC.sls b/AcroReaderDC.sls
index f452394d221ea267da19652f54cab85295eee274..6a12b68b992a737990ec76f9089ce8a93cc3838c 100644 (file)
--- a/AcroReaderDC.sls
+++ b/AcroReaderDC.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/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 555a775300644e74e4bdaa75d7823f99bca5827c..e51b9618f388e7c3b81676ccd534ced405f4ae03 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:

diff --git a/VERSION b/VERSION
index 89841e80dac751cb3c931e661f83b508aa903b0b..ff5a082f78979e862b5b2d379abf2a02a30adef3 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20.009.20063
+23.001.20143

diff --git a/oss-pkg-AcroReaderDC.spec.in b/oss-pkg-AcroReaderDC.spec.in
index cd3e3f74e3b4a84dffd7a18de967e6f8c9d93930..7189150f7ee4589d944fd7625f5831c6786636f4 100644 (file)
--- a/oss-pkg-AcroReaderDC.spec.in
+++ b/oss-pkg-AcroReaderDC.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/AcroRdrDCUpd2000920063.msp b/repo-ng/AcroRdrDCUpd2000920063.msp
deleted file mode 100644 (file)
index 19055c0..0000000
Binary files a/repo-ng/AcroRdrDCUpd2000920063.msp and /dev/null differ

diff --git a/repo-ng/AcroRdrDCx642300120143_de_DE.exe b/repo-ng/AcroRdrDCx642300120143_de_DE.exe
new file mode 100644 (file)
index 0000000..9f86758
Binary files /dev/null and b/repo-ng/AcroRdrDCx642300120143_de_DE.exe differ

diff --git a/repo-ng/Data1.cab b/repo-ng/Data1.cab
deleted file mode 100644 (file)
index 2a47798..0000000
Binary files a/repo-ng/Data1.cab and /dev/null differ

diff --git a/repo-ng/init.sls b/repo-ng/init.sls
index 2e568697e2450afd5c074bb643c1a0fc7211d433..f758cf6cd3df2c78a7910b26f0a061d7a7d11424 100644 (file)
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -1,9 +1,9 @@
 ###############################################################################
 # SLS: AcroReaderDC
-# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
+# Copyright (c) 2023 Helmuth Varkoly, Nuermberg, Germany.
 # All rights reserved.
 #
-# Authos:               Helmuth Varkoly
+# Authos:               Helmuth Varkoly, Maximilian Grunow
 #
 # Description:          Package SLS
 ###############################################################################
@@ -11,9 +11,9 @@
 {% set LOG_PATH = 'C:\\salt\\var\\log\\' %}
 
 AcroReaderDC:
-  '20.009.20063':
+  '23.001.20143':
       full_name: 'Adobe Acrobat Reader DC - Deutsch'
-      installer: salt://win/repo-ng/AcroReaderDC/setup.exe
+      installer: salt://win/repo-ng/AcroReaderDC/AcroRdrDCx642300120143_de_DE.exe
       install_flags: '/sAll /msi /l "{{ LOG_PATH }}AcroReaderDC_inst.log"'
       uninstaller: 'msiexec.exe'
       uninstall_flags: '/x "C:\\salt\\var\\cache\\salt\\minion\\files\\base\\win\\repo-ng\\AcroReaderDC\\AcroRead.msi" /quiet /log "{{ LOG_PATH }}AcroReaderDC_uninst.log" /norestart'

diff --git a/repo-ng/setup.exe b/repo-ng/setup.exe
deleted file mode 100644 (file)
index dd4beb7..0000000
Binary files a/repo-ng/setup.exe and /dev/null differ

diff --git a/repo-ng/setup.ini b/repo-ng/setup.ini
deleted file mode 100644 (file)
index 64b97de..0000000
--- a/repo-ng/setup.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[Startup]\r
-RequireMSI=3.0\r
-\r
-[Product]\r
-PATCH=AcroRdrDCUpd2000920063.msp\r
-msi=AcroRead.msi\r
-\r
-[MSI Updater]\r
-Path=http://ardownload.adobe.com/pub/adobe/reader/win/8.x/8.0/misc/WindowsInstaller-KB893803-v2-x86.exe\r