From: buildmaster Date: Mon, 22 Oct 2018 20:33:13 +0000 (+0200) Subject: Fix package. X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=879786c84721412cb4ddfc893f81c8be1ef2ed48;p=Win10ActKMS.git Fix package. --- diff --git a/Makefile b/Makefile index 50c588a..0dcf002 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,7 @@ YEAR = $(shell date +%Y ) package: - if [ ! -e oss-pkg-$(PACKAGE).spec ]; then cp ../template/package.spec oss-pkg-$(PACKAGE).spec; fi - sed -i s/VERSION/$(VERSION)/g oss-pkg-$(PACKAGE).spec + 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/YEAR/$(YEAR)/g oss-pkg-$(PACKAGE).spec diff --git a/oss-pkg-Win10ActKMS.sls b/oss-pkg-Win10ActKMS.spec.in similarity index 97% rename from oss-pkg-Win10ActKMS.sls rename to oss-pkg-Win10ActKMS.spec.in index 079b12d..65a66fb 100644 --- a/oss-pkg-Win10ActKMS.sls +++ b/oss-pkg-Win10ActKMS.spec.in @@ -52,7 +52,6 @@ rm -rf %{buildroot} %files %defattr(644,root,root) -/srv/salt/win/repo-ng/PACKAGE /srv/salt/packages/PACKAGE.sls