Fix package.

diff --git a/Makefile b/Makefile
index 50c588a500f799e5cd29f25a870b9e8b40244dbe..0dcf0020e1994605e17d3b81c3f79adb6e6ed702 100644 (file)
--- 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 079b12d8ea16b4a57df1da3b1ad4fcf2999e9070..65a66fbf821666a2c4929759d7a48f8a5ffc8894 100644 (file)
--- 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