From b81a946904a76198321dee1e377b69165c396f50 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 31 Oct 2018 18:05:46 +0100 Subject: [PATCH] Turn to full name. --- .gitignore | 1 + FULLNAMES | 1 + Makefile | 4 ++-- packages.spec.in | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 FULLNAMES diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..12b8d4b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +packages.spec diff --git a/FULLNAMES b/FULLNAMES new file mode 100644 index 0000000..1fd1ded --- /dev/null +++ b/FULLNAMES @@ -0,0 +1 @@ +Pro line one name diff --git a/Makefile b/Makefile index fc166cc..fb55e2d 100644 --- a/Makefile +++ b/Makefile @@ -6,14 +6,14 @@ 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/DISPLAYNAME/$(DISPLAYNAME)/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) diff --git a/packages.spec.in b/packages.spec.in index 079b12d..f3e7bdb 100644 --- a/packages.spec.in +++ b/packages.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/7zip/HASH.json %files %defattr(644,root,root) -- 2.43.0