From 423459c0749dbdf7a91b29536cbe04caf3d39c89 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 1 Nov 2018 09:46:21 +0100 Subject: [PATCH] fullnames --- Makefile | 1 + packages.spec.in => oss-pkg-packages.spec.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) rename packages.spec.in => oss-pkg-packages.spec.in (98%) diff --git a/Makefile b/Makefile index fb55e2d..2d912a9 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +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 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/packages.spec.in b/oss-pkg-packages.spec.in similarity index 98% rename from packages.spec.in rename to oss-pkg-packages.spec.in index f3e7bdb..cd3e3f7 100644 --- a/packages.spec.in +++ b/oss-pkg-packages.spec.in @@ -48,7 +48,7 @@ rm -rf %{buildroot} %post -/usr/sbin/oss_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/7zip/HASH.json +/usr/sbin/oss_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/PACKAGE/HASH.json %files %defattr(644,root,root) -- 2.43.0