[ostree] dist-packaging: Don't delete 91-ostree.preset, do clean old rpms/sources
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] dist-packaging: Don't delete 91-ostree.preset, do clean old rpms/sources
- Date: Sun, 5 Apr 2015 13:39:20 +0000 (UTC)
commit dcae7dee57888fa905e5e7091cdcae98797306fa
Author: Colin Walters <walters verbum org>
Date: Sun Apr 5 09:18:42 2015 -0400
dist-packaging: Don't delete 91-ostree.preset, do clean old rpms/sources
We have to copy the sources to avoid rpmbuild deleting them. But on
the other hand there's no reason for old sources to stick around.
packaging/Makefile.dist-packaging | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/packaging/Makefile.dist-packaging b/packaging/Makefile.dist-packaging
index e1389eb..b55211d 100644
--- a/packaging/Makefile.dist-packaging
+++ b/packaging/Makefile.dist-packaging
@@ -9,6 +9,7 @@ PACKAGE=ostree
PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG)
dist-snapshot:
+ rm -f *.tar.xz
set -x; \
echo "PACKAGE=$(PACKAGE)"; \
TARFILE_TMP=$(PKG_VER).tar.tmp; \
@@ -26,8 +27,14 @@ dist-snapshot:
xz $(PKG_VER).tar
srpm: dist-snapshot
- sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(PACKAGE).spec.in > $(PACKAGE).spec; \
- ./rpmbuild-cwd -bs $(PACKAGE).spec
+ (tmpd=`pwd`/tmp-packaging; rm -rf "$${tmpd}"; mkdir "$${tmpd}"; \
+ sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(PACKAGE).spec.in > "$${tmpd}/$(PACKAGE).spec"; \
+ cp 91-ostree.preset "$${tmpd}"; ln $(PKG_VER).tar.xz "$${tmpd}"; \
+ cd "$${tmpd}" && ../rpmbuild-cwd -bs $(PACKAGE).spec && mv *.src.rpm ..)
-rpm: srpm
- ./rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm
+rpm: dist-snapshot
+ rm -f *.rpm
+ (tmpd=`pwd`/tmp-packaging; rm -rf "$${tmpd}"; mkdir "$${tmpd}"; \
+ sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(PACKAGE).spec.in > "$${tmpd}/$(PACKAGE).spec"; \
+ cp 91-ostree.preset "$${tmpd}"; ln $(PKG_VER).tar.xz "$${tmpd}"; \
+ cd "$${tmpd}" && ../rpmbuild-cwd -bb $(PACKAGE).spec && mv $$(arch)/*.rpm ..)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]