From a19789f1e3b03a7e6e4fb01e14dbe6796bdb1859 Mon Sep 17 00:00:00 2001
From: Kevin Yue <yuezk001@gmail.com>
Date: Sun, 25 Feb 2024 09:55:52 +0800
Subject: [PATCH] Update rpm packaging

---
 Makefile                                        | 11 +++++------
 packaging/rpm/globalprotect-openconnect.spec.in |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 0256b9f..ad00e52 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -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
 
@@ -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
@@ -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
diff --git a/packaging/rpm/globalprotect-openconnect.spec.in b/packaging/rpm/globalprotect-openconnect.spec.in
index 4d592e9..42ac2f5 100644
--- a/packaging/rpm/globalprotect-openconnect.spec.in
+++ b/packaging/rpm/globalprotect-openconnect.spec.in
@@ -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