♻️ updated to version 2023-02

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..0683953
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+repo-ng/HASH.json
+oss-pkg-Eclipse.spec
\ No newline at end of file

diff --git a/Eclipse.sls b/Eclipse.sls
index f452394d221ea267da19652f54cab85295eee274..6a12b68b992a737990ec76f9089ce8a93cc3838c 100644 (file)
--- a/Eclipse.sls
+++ b/Eclipse.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 c2bf248073c03c003bf666ab765a4eb1b7255b99..5d6089c018b6892edcdd5c4a0c59eaaedcf639aa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ REPO            = /srv/www/repo/TESTING/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
@@ -22,7 +22,7 @@ package:
        mv  oss-pkg-$(PACKAGE).tar.bz2  /usr/src/packages/SOURCES/
        rpmbuild -bb oss-pkg-$(PACKAGE).spec
        cp /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch
-       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 a162ea75a967e35509bc5ac94844c6566af239b1..62744f47c23d326066ea052ee16d944fd56259f6 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.11.0
+2023.03

diff --git a/oss-pkg-Eclipse.spec.in b/oss-pkg-Eclipse.spec.in
index cd3e3f74e3b4a84dffd7a18de967e6f8c9d93930..7189150f7ee4589d944fd7625f5831c6786636f4 100644 (file)
--- a/oss-pkg-Eclipse.spec.in
+++ b/oss-pkg-Eclipse.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/EclipseInstaller.msi b/repo-ng/EclipseInstaller.msi
deleted file mode 100755 (executable)
index 37c3397..0000000
Binary files a/repo-ng/EclipseInstaller.msi and /dev/null differ

diff --git a/repo-ng/eclipse-inst-jre-win64.exe b/repo-ng/eclipse-inst-jre-win64.exe
new file mode 100644 (file)
index 0000000..cb36198
Binary files /dev/null and b/repo-ng/eclipse-inst-jre-win64.exe differ

diff --git a/repo-ng/init.sls b/repo-ng/init.sls
index 396df573d36baa63d4bc85d0ed52ee65619b5847..a8e3be45c602634d411fafea25c411a82e51b94a 100644 (file)
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -1,20 +1,19 @@
 ###############################################################################
 # SLS: Eclipse
-# Copyright (c) 2019 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
 ###############################################################################
 
-
 {% set LOG_PATH = 'C:\\salt\\var\\log' %}
 
 Eclipse:
   '4.11.0': 
-    installer: salt://win/repo-ng/Eclipse/EclipseInstaller.msi
-    uninstaller: salt://win/repo-ng/Eclipse/EclipseInstaller.msi
+    installer: salt://win/repo-ng/Eclipse/eclipse-inst-jre-win64.exe
+    uninstaller: salt://win/repo-ng/Eclipse/eclipse-inst-jre-win64.exe
     full_name: 'Eclipse'
     install_flags: '/q /l "{{ LOG_PATH }}\Eclipse_inst.log"'
     uninstall_flags: '/q /l "{{ LOG_PATH }}\Eclipse_uninst.log"'