From 23ee1fe881f6ba473d3f15330861a94c0ea07536 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 24 Sep 2020 09:19:42 +0200 Subject: [PATCH] New release --- Makefile | 5 ++++- RELEASE | 2 +- oss-pkg-VLC.spec | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fa45428..6035812 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,8 @@ 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 @@ -19,10 +21,11 @@ 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" git push createrepo $(REPO) + diff --git a/RELEASE b/RELEASE index b8626c4..7ed6ff8 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -4 +5 diff --git a/oss-pkg-VLC.spec b/oss-pkg-VLC.spec index 61d3e3a..e44d244 100644 --- a/oss-pkg-VLC.spec +++ b/oss-pkg-VLC.spec @@ -1,11 +1,11 @@ # # Spec file for VLC -# Copyright (c) 2019 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany. All rights reserved. +# Copyright (c) 2020 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany. All rights reserved. # Name: oss-pkg-VLC Summary: Package to install VLC on OSS-Clients -Version: 3.0.8 +Version: 3.0.11.0 Release: 5 License: GPL-2.0 Vendor: Peter Varkoly and Helmuth Varkoly -- 2.43.0