Adap license year too.

diff --git a/Makefile b/Makefile
index e736a55c202e2c1ee29d96ec66f0c3d7f479057d..4661935e02ff65d6b05ea7d71d222b690cfd37b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,22 +13,23 @@ package:
        sed -i s/YEAR/$(YEAR)/g        oss-pkg-$(PACKAGE).spec
        sed    s/VERSION/$(VERSION)/g  init.sls.in > repo-ng/init.sls
        ../oss-pkg-tools/create_hash.sh $(PACKAGE)
+       rm -rf oss-pkg-$(PACKAGE)
        mkdir -p oss-pkg-$(PACKAGE)
        sed s/PACKAGE/$(PACKAGE)/g  $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls
-       if [ -d repo-ng ]; then ln -s ../repo-ng/ oss-pkg-$(PACKAGE)/repo-ng; fi
+       if [ -d repo-ng ]; then cd oss-pkg-$(PACKAGE); ln -s ../repo-ng; cd ..; fi
        tar hjcvpf oss-pkg-$(PACKAGE).tar.bz2 oss-pkg-$(PACKAGE)  
        rm -rf oss-pkg-$(PACKAGE)
        mv  oss-pkg-$(PACKAGE).tar.bz2  /usr/src/packages/SOURCES/
        rpmbuild -bb oss-pkg-$(PACKAGE).spec
-       for i in $(REPO)/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm; do test -e $$i && rm $$i; done 
+       find $(REPO)/noarch -name "oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm"  -exec rm {} \;
        mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch
        echo $(NRELEASE) > RELEASE
        git commit -a -m "New release"
        createrepo $(REPO)
-       git push
+       #git push
 
 init:
-       test -d .git && rm -r .git
+       rm -fr .git
        mv oss-pkg-packages.spec.in oss-pkg-$(PACKAGE).spec.in
        sed -i 's/PACKAGE/$(PACKAGE)/g' oss-pkg-$(PACKAGE).spec.in
        mkdir repo-ng

diff --git a/init.sls.in b/init.sls.in
index e9e6f1a9d2e27f1420f3490a1446964c18bc0041..1f1f5b1bca0cd783dd438fdc4da9e7f9d3e5d0d4 100644 (file)
--- a/init.sls.in
+++ b/init.sls.in
@@ -15,7 +15,7 @@
 
 {% set LOG_PATH = 'C:\\salt\\var\\log' %}
 
-Package:
+PACKAGE:
   'VERSION':
       full_name: 'TOREPLACE'
       installer: salt://win/repo-ng/PACKAGE/TOREPLACE.exe