From: buildmaster <buildmaster@git.cephalix.eu>
Date: Wed, 7 Nov 2018 12:26:38 +0000 (+0100)
Subject: New release
X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=892c36b110b2c58090883703fe3675118125d544;p=MsOffice2016StandardKMS.git

New release
---

diff --git a/Makefile b/Makefile
index 0a8f808..8ae6875 100644
--- 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 7ed6ff8..1e8b314 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-5
+6
diff --git a/oss-pkg-MsOffice2016StandardKMS.spec b/oss-pkg-MsOffice2016StandardKMS.spec
index 20b1d5b..5f6d986 100644
--- 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