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

fullnames
---

diff --git a/FULLNAMES b/FULLNAMES
new file mode 100644
index 0000000..e4a5074
--- /dev/null
+++ b/FULLNAMES
@@ -0,0 +1 @@
+GIMP 2.10.6
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-Gimp.spec.in b/oss-pkg-Gimp.spec.in
index 079b12d..cd3e3f7 100644
--- a/oss-pkg-Gimp.spec.in
+++ b/oss-pkg-Gimp.spec.in
@@ -48,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)