Skip to content

Commit 2e80d28

Browse files
committed
[bld] Generate .tar.gz source archives rather than .tar.xz
Signed-off-by: David Cantrell <[email protected]>
1 parent 7ca351d commit 2e80d28

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.copr/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,22 @@ srpm:
6161
sed -i -e 's|%%GPGKEYRING%%|gpgkey-$(GPGKEY).gpg|g' "$(SPEC)"
6262
ifeq ($(BUILDTYPE),copr)
6363
sed -i -e '/^Release:/ s/1[^%]*/0.1.$(GITDATE)git$(GITHASH)/' "$(SPEC)"
64-
sed -i -e 's|^Source0:.*$$|Source0: $(TARBALL_BASENAME).tar.xz|g' "$(SPEC)"
64+
sed -i -e 's|^Source0:.*$$|Source0: $(TARBALL_BASENAME).tar.gz|g' "$(SPEC)"
6565
sed -i -e 's|^%autosetup.*$$|%autosetup -n $(TARBALL_BASENAME)|g' "$(SPEC)"
6666
sed -i -e '/^Source1:.*$$/d' "$(SPEC)"
6767
sed -i -e '/^Source2:.*$$/d' "$(SPEC)"
6868
sed -i -e '/^%{gpgverify}.*$$/d' "$(SPEC)"
6969
echo "* $(RPMDATE) $(RPMAUTHOR) - $(VER)-$(GITDATE)git$(GITHASH)" >> "$(SPEC)"
7070
echo "- Build $(PKG)-$(VER)-$(GITDATE)git$(GITHASH) snapshot" >> "$(SPEC)"
7171
endif
72-
rm -f "$(TARBALL_BASENAME)".tar.xz.asc
72+
rm -f "$(TARBALL_BASENAME)".tar.gz.asc
7373
git archive \
7474
--format=tar \
7575
--output='$(topdir)/$(TARBALL_BASENAME).tar' \
7676
--prefix='$(TARBALL_BASENAME)/' $(TAG) $(topdir)
77-
xz -9f $(topdir)/$(TARBALL_BASENAME).tar
77+
gzip -9f $(topdir)/$(TARBALL_BASENAME).tar
7878
ifeq ($(BUILDTYPE),release)
79-
gpg --detach-sign --armor "$(TARBALL_BASENAME)".tar.xz
79+
gpg --detach-sign --armor "$(TARBALL_BASENAME)".tar.gz
8080
gpg --export -a $(GPGKEY) > gpgkey-$(GPGKEY).gpg
8181
endif
8282
rpmbuild \

GNUmakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ PRIMARY_AUTHORS = [email protected]
6060

6161
# full path to release tarball and detached signature
6262
# (this comes from a 'make srpm')
63-
RELEASED_TARBALL = $(PROJECT_NAME)-$(PROJECT_VERSION).tar.xz
63+
RELEASED_TARBALL = $(PROJECT_NAME)-$(PROJECT_VERSION).tar.gz
6464
RELEASED_TARBALL_ASC = $(RELEASED_TARBALL).asc
6565

6666
# The python executable to use for the debug build and tests

RELEASE

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Use the upstream release repo for these steps:
4646
contents of 'newchanges' in the description box. Attach these
4747
files to the release from this directory:
4848

49-
rpminspect-X.Y.tar.xz
50-
rpminspect-X.Y.tar.xz.asc
49+
rpminspect-X.Y.tar.gz
50+
rpminspect-X.Y.tar.gz.asc
5151

5252
[ ] make koji
5353

rpminspect.spec.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Group: Development/Tools
2222
# * libtoml/ is BSD-3-Clause
2323
License: GPL-3.0-or-later AND LGPL-3.0-or-later AND LGPL-2.1-or-later AND Apache-2.0 AND MIT AND AND BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-4.0
2424
URL: https://github.com/rpminspect/rpminspect
25-
Source0: https://github.com/rpminspect/rpminspect/releases/download/v%{version}/%{name}-%{version}.tar.xz
26-
Source1: https://github.com/rpminspect/rpminspect/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc
25+
Source0: https://github.com/rpminspect/rpminspect/releases/download/v%{version}/%{name}-%{version}.tar.gz
26+
Source1: https://github.com/rpminspect/rpminspect/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
2727
Source2: %%GPGKEYRING%%
2828
Requires: librpminspect%{?_isa} = %{version}-%{release}
2929

utils/release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fi
130130
meson setup build
131131
ninja -v -C build dist
132132
cd build/meson-dist || exit
133-
gpg --detach-sign --armor "${PROJECT}"-"${VERSION}".tar.xz
133+
gpg --detach-sign --armor "${PROJECT}"-"${VERSION}".tar.gz
134134
cd "${CWD}" || exit
135135

136136
# Push the changes

0 commit comments

Comments
 (0)