]> repo.cephalix.eu Git - MsOffice2016ProfPlusDE.git/commitdiff
Fix the api call and the make file.
authorbuildmaster <buildmaster@git.cephalix.eu>
Tue, 19 Sep 2017 19:34:28 +0000 (21:34 +0200)
committerbuildmaster <buildmaster@git.cephalix.eu>
Tue, 19 Sep 2017 19:34:28 +0000 (21:34 +0200)
Makefile
packages.spec.in

index ac9a108cd415f8dd4d640372b5f78faa7ef556d7..0281e97ba3947ab8e9071bc64ea90be02eaa1014 100644 (file)
--- 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
index fefb3075bce496102d4f491656d7628c091fc975..b58c49c7613cbb6843167d853249ef048553623c 100644 (file)
@@ -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)