From: buildmaster Date: Tue, 19 Sep 2017 19:34:28 +0000 (+0200) Subject: Fix the api call and the make file. X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=85df10edc74251ea4bd9c150bb10b7e8b9e28314;p=MsOffice2016ProfPlusDE.git Fix the api call and the make file. --- diff --git a/Makefile b/Makefile index ac9a108..0281e97 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,9 @@ NRELEASE = $(shell echo $(RELEASE) + 1 | bc ) package: cp packages.spec.in oss-pkg-$(PACKAGE).spec - sed -i s/VERSION/$(VERSION)/ oss-pkg-$(PACKAGE).spec - sed -i s/RELEASE/$(NRELEASE)/ oss-pkg-$(PACKAGE).spec - sed -i s/PACKAGE/$(PACKAGE)/ oss-pkg-$(PACKAGE).spec + sed -i s/VERSION/$(VERSION)/g oss-pkg-$(PACKAGE).spec + sed -i s/RELEASE/$(NRELEASE)/g oss-pkg-$(PACKAGE).spec + sed -i s/PACKAGE/$(PACKAGE)/g oss-pkg-$(PACKAGE).spec mkdir -p oss-pkg-$(PACKAGE) ln -s ../$(PACKAGE).sls oss-pkg-$(PACKAGE)/$(PACKAGE).sls if [ -d repo-ng ]; then ln -s ../repo-ng/ oss-pkg-$(PACKAGE)/repo-ng; fi diff --git a/packages.spec.in b/packages.spec.in index fefb307..b58c49c 100644 --- a/packages.spec.in +++ b/packages.spec.in @@ -49,7 +49,7 @@ rm -rf %{buildroot} %post -/usr/sbin/oss_api.sh POST 'softwares/add' '{"name":"PACKAGE","manuell":false,"description":"PACKAGE","softwareVersions":[{"version":"VERSION"}]}' +/usr/sbin/oss_api.sh POST 'softwares/add' '{"name":"PACKAGE","manually":false,"description":"PACKAGE","softwareVersions":[{"version":"VERSION"}]}' %files %defattr(644,root,root)