From a356574c23c16669fbbd75689e40ab744c877f55 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 15 Oct 2021 12:10:17 +0200 Subject: [PATCH] New release --- Makefile | 4 ++-- RELEASE | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 528b706..396bfaf 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 ) @@ -20,7 +20,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 c227083..d00491f 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -0 \ No newline at end of file +1 -- 2.43.0