From a308591b69b37cc72be87aec6cab7217f6673907 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 31 Oct 2018 12:01:37 +0100 Subject: [PATCH] Take care about full names. --- .gitignore | 2 ++ FULLNAMES | 14 ++++++++++++++ Makefile | 1 + oss-pkg-MsOffice2016StandardKMS.spec.in | 2 +- 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 FULLNAMES diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d5b41ad --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +oss-pkg-MsOffice2016StandardKMS.spec +repo-ng/HASH.json diff --git a/FULLNAMES b/FULLNAMES new file mode 100644 index 0000000..319d52e --- /dev/null +++ b/FULLNAMES @@ -0,0 +1,14 @@ +Microsoft Excel MUI (German) 2016 +Microsoft Groove MUI (German) 2016 +Microsoft Office 64-bit Components 2016 +Microsoft Office OSM MUI (German) 2016 +Microsoft Office OSM UX MUI (German) 2016 +Microsoft Office Proofing (German) 2016 +Microsoft Office Proofing Tools 2016 - English +Microsoft Office Shared 64-bit MUI (German) 2016 +Microsoft Office Shared MUI (German) 2016 +Microsoft Office Standard 2016 +Microsoft OneNote MUI (German) 2016 +Microsoft Outlook MUI (German) 2016 +Microsoft Publisher MUI (German) 2016 +Microsoft Word MUI (German) 2016 diff --git a/Makefile b/Makefile index 0dcf002..0a8f808 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-MsOffice2016StandardKMS.spec.in b/oss-pkg-MsOffice2016StandardKMS.spec.in index a0a87a0..f844098 100644 --- a/oss-pkg-MsOffice2016StandardKMS.spec.in +++ b/oss-pkg-MsOffice2016StandardKMS.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