fullnames

diff --git a/FULLNAMES b/FULLNAMES
new file mode 100644 (file)
index 0000000..dcea695
--- /dev/null
+++ b/FULLNAMES
@@ -0,0 +1,6 @@
+Java SE Development Kit 8 Update 131 (64-bit)
+Java SE Development Kit 8 Update 131
+Java SE Development Kit 7 Update 80 (64-bit)
+Java SE Development Kit 7 Update 80
+Java SE Development Kit 6 Update 45 (64-bit)
+Java SE Development Kit 6 Update 45

diff --git a/Makefile b/Makefile
index fc166cc7d169157b4da4f61f01246510f6906b99..8ae6875c83ad5215bf971ef6ff5c45c9b040620c 100644 (file)
--- 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-JavaJDK.spec.in b/oss-pkg-JavaJDK.spec.in
index 76e3bee6b5b8ebffec4626c977ee565c9a5156d8..cd3e3f74e3b4a84dffd7a18de967e6f8c9d93930 100644 (file)
--- a/oss-pkg-JavaJDK.spec.in
+++ b/oss-pkg-JavaJDK.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)