Techognito/starter-kit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move to xz dist tarballs

Browse source 
For consistency with the already xz'ed node tarball.

Rename the oddly named `dist-gzip` target to the standard `dist`.

Cherry-picked from starter-kit commit 4ca75f143c
This commit is contained in:
Katerina Koukiou 2021-11-08 12:30:33 +01:00 • committed by Justin Stephenson
parent 47c1eb0804
commit 3ebdcfa4fe
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,6 +1,6 @@
*~ *~
*.retry *.retry
*.tar.gz *.tar.xz
*.rpm *.rpm
node_modules/ node_modules/
dist/ dist/

8
Makefile
View file

@ -5,7 +5,7 @@ ifeq ($(TEST_OS),)
TEST_OS = rhel-x TEST_OS = rhel-x
endif endif
export TEST_OS export TEST_OS
TARFILE=cockpit-$(PACKAGE_NAME)-$(VERSION).tar.gz TARFILE=cockpit-$(PACKAGE_NAME)-$(VERSION).tar.xz
RPMFILE=$(shell rpmspec -D"VERSION $(VERSION)" -q cockpit-session-recording.spec.in).rpm RPMFILE=$(shell rpmspec -D"VERSION $(VERSION)" -q cockpit-session-recording.spec.in).rpm
VM_IMAGE=$(CURDIR)/test/images/$(TEST_OS) VM_IMAGE=$(CURDIR)/test/images/$(TEST_OS)
# stamp file to check if/when npm install ran # stamp file to check if/when npm install ran
@ -88,7 +88,7 @@ devel-install: $(WEBPACK_TEST)
mkdir -p ~/.local/share/cockpit mkdir -p ~/.local/share/cockpit
ln -s `pwd`/dist ~/.local/share/cockpit/$(PACKAGE_NAME) ln -s `pwd`/dist ~/.local/share/cockpit/$(PACKAGE_NAME)
dist-gzip: $(TARFILE) dist: $(TARFILE)
# when building a distribution tarball, call webpack with a 'production' environment # when building a distribution tarball, call webpack with a 'production' environment
# we don't ship node_modules for license and compactness reasons; we ship a # we don't ship node_modules for license and compactness reasons; we ship a
@ -100,7 +100,7 @@ $(TARFILE): $(WEBPACK_TEST) cockpit-$(PACKAGE_NAME).spec
mv node_modules node_modules.release mv node_modules node_modules.release
touch -r package.json $(NODE_MODULES_TEST) touch -r package.json $(NODE_MODULES_TEST)
touch dist/* touch dist/*
tar czf cockpit-$(PACKAGE_NAME)-$(VERSION).tar.gz --transform 's,^,cockpit-$(PACKAGE_NAME)/,' \ tar --xz -cf cockpit-$(PACKAGE_NAME)-$(VERSION).tar.xz --transform 's,^,cockpit-$(PACKAGE_NAME)/,' \
--exclude cockpit-$(PACKAGE_NAME).spec.in \ --exclude cockpit-$(PACKAGE_NAME).spec.in \
$$(git ls-files) package-lock.json cockpit-$(PACKAGE_NAME).spec dist/ $$(git ls-files) package-lock.json cockpit-$(PACKAGE_NAME).spec dist/
mv node_modules.release node_modules mv node_modules.release node_modules
@ -175,4 +175,4 @@ $(NODE_MODULES_TEST): package.json
env -u NODE_ENV npm install env -u NODE_ENV npm install
env -u NODE_ENV npm prune env -u NODE_ENV npm prune
.PHONY: all clean install devel-install dist-gzip srpm rpm check vm update-po .PHONY: all clean install devel-install dist srpm rpm check vm update-po

2
cockpit-session-recording.spec.in
View file

@ -4,7 +4,7 @@ Release: 1%{?dist}
Summary: Cockpit Session Recording Summary: Cockpit Session Recording
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/Scribery/%{name} URL: https://github.com/Scribery/%{name}
Source: https://github.com/Scribery/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz Source: https://github.com/Scribery/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
BuildArch: noarch BuildArch: noarch
BuildRequires: libappstream-glib BuildRequires: libappstream-glib