New release

diff --git a/Makefile b/Makefile
index 0a8f808f6b97d9dc7dfa56f362c8e999e78e3915..8ae6875c83ad5215bf971ef6ff5c45c9b040620c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,25 @@
 PACKAGE         = $(shell basename `pwd` )
 DESTDIR         = /
-REPO            = /srv/www/repo/salt-packages/
+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 )
 
-
 package:
-       sed s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in > oss-pkg-$(PACKAGE).spec
+       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/RELEASE b/RELEASE
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..1e8b314962144c26d5e0e50fd29d2ca327864913 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-5
+6

diff --git a/oss-pkg-MsOffice2016StandardKMS.spec b/oss-pkg-MsOffice2016StandardKMS.spec
index 20b1d5ba66b4f052170b6aae8ad801a1047f3b95..5f6d986625749ddf802ab128963af14d70f71b4e 100644 (file)
--- a/oss-pkg-MsOffice2016StandardKMS.spec
+++ b/oss-pkg-MsOffice2016StandardKMS.spec
@@ -6,7 +6,7 @@
 Name:         oss-pkg-MsOffice2016StandardKMS
 Summary:      Package to install MsOffice2016StandardKMS on OSS-Clients
 Version:      16.0
-Release:      5
+Release:      6
 License:      GPL-2.0
 Vendor:       Peter Varkoly and Helmuth Varkoly
 Packager:     peter@varkoly.de