New release

diff --git a/Makefile b/Makefile
index 6d1c30d30c044dc2396fec5c025d0d91170532e6..1622c5377b95a8fa0e68e1e79022409c47fc8bcd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,48 @@
 PACKAGE         = $(shell basename `pwd` )
 DESTDIR         = /
-REPO            = /srv/www/repo/TESTING/salt-packages/
+REPO            = /srv/www/repo/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/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)
+       #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"
+       #ägit push
+       #createrepo $(REPO)
+       
        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)  
+       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"
-       git push
+       #git push
        createrepo $(REPO)
 

diff --git a/RELEASE b/RELEASE
index 1e8b314962144c26d5e0e50fd29d2ca327864913..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-6
+7