Fix make

diff --git a/Makefile b/Makefile
index f74caeb6bbd6e47fe6e8689ff289445a2db705b3..8ae6875c83ad5215bf971ef6ff5c45c9b040620c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,25 @@
 PACKAGE         = $(shell basename `pwd` )
 DESTDIR         = /
-REPO            = /srv/www/repo/salt-packages/
+REPO            = /srv/www/repo/TESTING/salt-packages/
 VERSION         = $(shell cat VERSION )
 RELEASE         = $(shell cat RELEASE )
 NRELEASE        = $(shell echo $(RELEASE) + 1 | bc )
 YEAR           = $(shell date +%Y )
 
-
 package:
        sed    s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in > 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
        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
        if [ -d repo-ng ]; then ln -s ../repo-ng/ oss-pkg-$(PACKAGE)/repo-ng; 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 
        mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch
        echo $(NRELEASE) > RELEASE
        git commit -a -m "New release"