From: buildmaster <buildmaster@git.cephalix.eu>
Date: Mon, 5 Nov 2018 16:15:00 +0000 (+0100)
Subject: fullnames
X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=cfb6be15b38cb9276e1a21a27a2ce2a56c4a9a5d;p=JavaRuntime.git

fullnames
---

diff --git a/FULLNAMES b/FULLNAMES
new file mode 100644
index 0000000..a653023
--- /dev/null
+++ b/FULLNAMES
@@ -0,0 +1,6 @@
+Java(TM) 6 Update 45 (64-bit)
+Java(TM) 6 Update 45
+Java 7 Update 80 (64-bit)
+Java 7 Update 80
+Java 8 Update 131 (64-bit)
+Java 8 Update 131
diff --git a/Makefile b/Makefile
index fc166cc..8ae6875 100644
--- a/Makefile
+++ b/Makefile
@@ -6,20 +6,20 @@ RELEASE         = $(shell cat RELEASE )
 NRELEASE        = $(shell echo $(RELEASE) + 1 | bc )
 YEAR		= $(shell date +%Y )
 
-
 package:
 	sed    s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in > oss-pkg-$(PACKAGE).spec
 	sed -i s/RELEASE/$(NRELEASE)/g oss-pkg-$(PACKAGE).spec
 	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)
 	mkdir -p oss-pkg-$(PACKAGE)
-	if [ ! -e $(PACKAGE).sls ];  then cp ../template/template.sls $(PACKAGE).sls; fi
 	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
 	tar hjcvpf oss-pkg-$(PACKAGE).tar.bz2 oss-pkg-$(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 
 	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/oss-pkg-JavaRuntime.spec.in b/oss-pkg-JavaRuntime.spec.in
index 76e3bee..cd3e3f7 100644
--- a/oss-pkg-JavaRuntime.spec.in
+++ b/oss-pkg-JavaRuntime.spec.in
@@ -1,6 +1,6 @@
 #
 # Spec file for PACKAGE
-# Copyright (c) YEAR Helmuth Varkoly and Peter Varkoly Nürnberg, Germany.  All rights reserved.
+# Copyright (c) YEAR Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
 #
 
 Name:         oss-pkg-PACKAGE
@@ -9,7 +9,6 @@ Version:      VERSION
 Release:      RELEASE
 License:      GPL-2.0
 Vendor:       Peter Varkoly and Helmuth Varkoly
-Distribution: SLE11
 Packager:     peter@varkoly.de
 Group:        Productivity/
 Source:       %{name}.tar.bz2
@@ -49,7 +48,7 @@ rm -rf %{buildroot}
 
 %post
 
-/usr/sbin/oss_api.sh POST 'softwares/add' '{"name":"PACKAGE","manually":false,"description":"PACKAGE","softwareVersions":[{"version":"VERSION"}]}'
+/usr/sbin/oss_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/PACKAGE/HASH.json
 
 %files
 %defattr(644,root,root)