From: buildmaster <buildmaster@git.cephalix.eu>
Date: Mon, 28 Sep 2020 20:58:16 +0000 (+0200)
Subject: Update to 6 classic
X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=b5a5d310fcb7d40c6a26db0437e8490efb5107a7;p=GeoGebra.git

Update to 6 classic
---

diff --git a/FULLNAMES b/FULLNAMES
index e47bdbb..34ee4eb 100644
--- a/FULLNAMES
+++ b/FULLNAMES
@@ -1 +1 @@
-GeoGebra 5
+GeoGebra Classic
diff --git a/Makefile b/Makefile
index 6d1c30d..6035812 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE         = $(shell basename `pwd` )
 DESTDIR         = /
-REPO            = /srv/www/repo/TESTING/salt-packages/
+REPO            = /srv/www/repo/salt-packages/
 VERSION         = $(shell cat VERSION )
 RELEASE         = $(shell cat RELEASE )
 NRELEASE        = $(shell echo $(RELEASE) + 1 | bc )
@@ -12,6 +12,8 @@ package:
 	sed -i s/PACKAGE/$(PACKAGE)/g  oss-pkg-$(PACKAGE).spec
 	sed -i s/YEAR/$(YEAR)/g        oss-pkg-$(PACKAGE).spec
 	../oss-pkg-tools/create_hash.sh $(PACKAGE)
+	rm -rf oss-pkg-$(PACKAGE)
+	rm -rf repo-ng/repo-ng
 	mkdir -p oss-pkg-$(PACKAGE)
 	sed s/PACKAGE/$(PACKAGE)/g  $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls
 	if [ -d repo-ng ]; then ln -s ../repo-ng/ oss-pkg-$(PACKAGE)/repo-ng; fi
@@ -19,10 +21,11 @@ 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"
 	git push
 	createrepo $(REPO)
 
+
diff --git a/VERSION b/VERSION
index 635d184..f883907 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.0.489.0
+6.0.606.0
diff --git a/repo-ng/GeoGebra-Windows-Installer-6-0-606-0.msi b/repo-ng/GeoGebra-Windows-Installer-6-0-606-0.msi
new file mode 100644
index 0000000..06e8b23
Binary files /dev/null and b/repo-ng/GeoGebra-Windows-Installer-6-0-606-0.msi differ
diff --git a/repo-ng/init.sls b/repo-ng/init.sls
index 646d507..e16462a 100644
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -16,13 +16,13 @@
 {% set LOG_PATH = 'C:\\salt\\var\\log\\' %}
 
 GeoGebra:
-  '5.0.570.0':
-    full_name: 'GeoGebra 5'
-    installer: salt://win/repo-ng/GeoGebra/GeoGebra-Windows-Installer-5-0-570-0.msi
-    uninstaller: salt://win/repo-ng/GeoGebra/GeoGebra-Windows-Installer-5-0-570-0.msi
+  '6.0.606.0':
+    full_name: 'GeoGebra Classic'
+    installer: salt://win/repo-ng/GeoGebra/GeoGebra-Windows-Installer-6-0-606-0.msi
+    uninstaller: salt://win/repo-ng/GeoGebra/GeoGebra-Windows-Installer-6-0-606-0.msi
     install_flags: 'ALLUSERS=2 /qn /log {{ LOG }}GeoGebra_inst.log'
     uninstall_flags: '/qn /log {{ LOG }}GeoGebra_uninst.log'
-    msiexec: False
+    msiexec: True
     locale: de_DE
     reboot: False
     cache_dir: True