Skip to content

Commit

Permalink
Update rpm packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
yuezk committed Feb 25, 2024
1 parent a0891e9 commit a19789f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ tarball: clean clean-tarball build-fe cargo-vendor
extract-vendor:
if [ -f vendor.tar.xz ]; then tar -xJf vendor.tar.xz; fi

build: extract-vendor build-fe build-rs gpgui-helper
build: build-fe build-rs

# Install and build the frontend
# If OFFLINE is set to 1, skip it
Expand All @@ -52,14 +52,13 @@ build-fe:
exit 1; \
fi

build-rs:
build-rs: extract-vendor
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpauth -p gpservice

gpgui-helper:
$(CARGO) build $(CARGO_BUILD_ARGS) -p gpgui-helper --features "tauri/custom-protocol"

clean:
$(CARGO) clean
rm -rf .rpm
rm -rf .vendor
rm -rf apps/gpgui-helper/node_modules

Expand Down Expand Up @@ -123,7 +122,7 @@ publish-ppa: ppa
# Generate RPM sepc file
rpm-spec:
rm -rf .rpm
mkdir -p .rpm
mkdir .rpm

cp packaging/rpm/globalprotect-openconnect.spec.in .rpm/globalprotect-openconnect.spec
cp packaging/rpm/globalprotect-openconnect.changes.in .rpm/globalprotect-openconnect.changes
Expand Down Expand Up @@ -154,5 +153,5 @@ rpm: rpm-spec

# Copy the SRPM only for x86_64.
if [ "$(shell uname -m)" = "x86_64" ]; then \
cp $(HOME)/rpmbuild/SRPMS/$(PKG_NAME)*.rpm .rpm \
cp $(HOME)/rpmbuild/SRPMS/$(PKG_NAME)*.rpm .rpm; \
fi
2 changes: 1 addition & 1 deletion packaging/rpm/globalprotect-openconnect.spec.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: globalprotect-openconnect
Version: @VERSION@
Release: @REVISION@%{?dist}
Release: @REVISION@
Summary: A GlobalProtect VPN client powered by OpenConnect
Group: Productivity/Networking/PPP

Expand Down

0 comments on commit a19789f

Please sign in to comment.