From 426cf1e24d76233074a89ea6b50a557eb1699d5b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 31 Oct 2018 20:42:22 +0100 Subject: [PATCH] fullnames --- Makefile | 1 + oss-pkg-LibreOffice.spec.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fc166cc..cc02aa0 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ package: 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 diff --git a/oss-pkg-LibreOffice.spec.in b/oss-pkg-LibreOffice.spec.in index 079b12d..cd3e3f7 100644 --- a/oss-pkg-LibreOffice.spec.in +++ b/oss-pkg-LibreOffice.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) -- 2.43.0