From 23a6789f532db7b517f7d83c285fdec4c82c5292 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sun, 30 Aug 2020 11:56:01 +0200 Subject: [PATCH] New release --- Makefile | 6 ++---- RELEASE | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0c0dc1c..fd29b89 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ 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 ) @@ -12,8 +12,6 @@ package: 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) - rm -rf oss-pkg-$(PACKAGE) - rm -rf repo-ng/repo-ng 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 @@ -21,7 +19,7 @@ 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" diff --git a/RELEASE b/RELEASE index 7f8f011..45a4fb7 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -7 +8 -- 2.43.0