COPR, spec

- `.copr`: - Update `Makefile` based on contributions from @pemensik - Skip prerequisites installation if already installed - Possible to reuse `rpmbuild` and checked out `dist-tools` - Add support for submodules if present - Overwrite existing source tarball - Update `dist-tools` - Quote all shell variables - Remove `autobuild` branch checkout - `spec`: Update source based on contributions from @pemensik - Possible to obtain source file with `spectool -g rpm/*.spec`
DNS-OARC · Sep 3, 2019 · d610061 · d610061
1 parent 212c9a7
commit d610061
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/.copr/Makefile b/.copr/Makefile
@@ -1,9 +1,22 @@
-srpm:
-	dnf -y install git rpm-build
-	git checkout -b autobuild
-	git clone https://github.com/jelu/dist-tools.git ../dist-tools
-	nosign=yes ../dist-tools/create-source-packages rpm
-	mkdir -p ../rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-	cp ../*.orig.tar.gz ../rpmbuild/SOURCES/
-	rpmbuild -bs --define "%_topdir ../rpmbuild" --undefine=dist "$(spec)"
-	cp ../rpmbuild/SRPMS/*.src.rpm "$(outdir)"
+top=..
+
+all: srpm
+
+prereq: $(top)/rpmbuild
+	rpm -q git rpm-build >/dev/null || dnf -y install git rpm-build
+
+update-dist-tools: $(top)/dist-tools
+	( cd "$(top)/dist-tools" && git pull )
+
+$(top)/dist-tools:
+	git clone https://github.com/jelu/dist-tools.git "$(top)/dist-tools"
+
+$(top)/rpmbuild:
+	mkdir -p "$(top)"/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
+
+srpm: prereq update-dist-tools
+	test -f .gitmodules && git submodule update --init || true
+	overwrite=yes nosign=yes "$(top)/dist-tools/create-source-packages" rpm
+	cp ../*.orig.tar.gz "$(top)/rpmbuild/SOURCES/"
+	rpmbuild -bs --define "%_topdir $(top)/rpmbuild" --undefine=dist "$(spec)"
+	cp "$(top)"/rpmbuild/SRPMS/*.src.rpm "$(outdir)"
diff --git a/rpm/packetq.spec b/rpm/packetq.spec
@@ -8,7 +8,7 @@ License:        GPL-3.0
 URL:            https://github.com/DNS-OARC/PacketQ
 # Source needs to be generated by dist-tools/create-source-packages, see
 # https://github.com/jelu/dist-tools
-Source0:        %{name}_%{version}.orig.tar.gz
+Source0:        https://github.com/DNS-OARC/PacketQ/archive/v%{version}.tar.gz?/%{name}_%{version}.orig.tar.gz
 
 BuildRequires:  zlib-devel
 BuildRequires:  autoconf