From f44cd859718c46cc8658833892da047c45e8be0f Mon Sep 17 00:00:00 2001
From: Kevin Yue <yuezk001@gmail.com>
Date: Sun, 25 Feb 2024 10:37:52 +0800
Subject: [PATCH] Use .build folder

---
 .github/workflows/build.yaml |  6 +++---
 .gitignore                   |  2 +-
 Makefile                     | 28 +++++++++++++++-------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 85e7a6c..fd17c63 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -89,8 +89,8 @@ jobs:
     - name: Install RPM package
       run: |
         cd globalprotect-openconnect-*/
-        ls -l .rpm
-        sudo rpm -i ".rpm/globalprotect-openconnect/*$(uname -m).rpm"
+        ls -l .build/rpm
+        sudo rpm -i ".build/rpm/globalprotect-openconnect/*$(uname -m).rpm"
 
         gpclient --version
         gpservice --version
@@ -102,7 +102,7 @@ jobs:
       with:
         name: artifact-rpm
         path: |
-          globalprotect-openconnect-*/.rpm/*.rpm
+          globalprotect-openconnect-*/.build/rpm/*.rpm
 
   # Include arm64 if ref is a tag
   # setup-matrix:
diff --git a/.gitignore b/.gitignore
index ca4f662..498e6c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@
 *.tar.xz
 
 .cargo
-.rpm
+.build
diff --git a/Makefile b/Makefile
index ad00e52..42f8c00 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ build-rs: extract-vendor
 
 clean:
 	$(CARGO) clean
-	rm -rf .rpm
+	rm -rf .build
 	rm -rf .vendor
 	rm -rf apps/gpgui-helper/node_modules
 
@@ -121,18 +121,18 @@ publish-ppa: ppa
 
 # Generate RPM sepc file
 rpm-spec:
-	rm -rf .rpm
-	mkdir .rpm
+	rm -rf .build/rpm
+	mkdir -p .build/rpm
 
-	cp packaging/rpm/globalprotect-openconnect.spec.in .rpm/globalprotect-openconnect.spec
-	cp packaging/rpm/globalprotect-openconnect.changes.in .rpm/globalprotect-openconnect.changes
+	cp packaging/rpm/globalprotect-openconnect.spec.in .build/rpm/globalprotect-openconnect.spec
+	cp packaging/rpm/globalprotect-openconnect.changes.in .build/rpm/globalprotect-openconnect.changes
 
-	sed -i "s/@VERSION@/$(VERSION)/g" .rpm/globalprotect-openconnect.spec
-	sed -i "s/@REVISION@/$(REVISION)/g" .rpm/globalprotect-openconnect.spec
-	sed -i "s/@DATE@/$(shell date "+%a %b %d %Y")/g" .rpm/globalprotect-openconnect.spec
+	sed -i "s/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.spec
+	sed -i "s/@REVISION@/$(REVISION)/g" .build/rpm/globalprotect-openconnect.spec
+	sed -i "s/@DATE@/$(shell date "+%a %b %d %Y")/g" .build/rpm/globalprotect-openconnect.spec
 
-	sed -i "s/@VERSION@/$(VERSION)/g" .rpm/globalprotect-openconnect.changes
-	sed -i "s/@DATE@/$(shell LC_ALL=en.US date -u "+%a %b %e %T %Z %Y")/g" .rpm/globalprotect-openconnect.changes
+	sed -i "s/@VERSION@/$(VERSION)/g" .build/rpm/globalprotect-openconnect.changes
+	sed -i "s/@DATE@/$(shell LC_ALL=en.US date -u "+%a %b %e %T %Z %Y")/g" .build/rpm/globalprotect-openconnect.changes
 
 # Ensure ../globalprotect-openconnect-*.tar.gz exists.
 rpm: rpm-spec
@@ -146,12 +146,14 @@ rpm: rpm-spec
 
 	cp ../$(PKG).tar.gz $(HOME)/rpmbuild/SOURCES/$(PKG_NAME).tar.gz
 
-	rpmbuild -ba .rpm/globalprotect-openconnect.spec
+	rpmbuild -ba .build/rpm/globalprotect-openconnect.spec
 
 	# Copy RPM package
-	cp $(HOME)/rpmbuild/RPMS/$(shell uname -m)/$(PKG_NAME)*.rpm .rpm
+	cp $(HOME)/rpmbuild/RPMS/$(shell uname -m)/$(PKG_NAME)*.rpm .build/rpm
 
 	# 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 .build/rpm; \
 	fi
+
+pkgbuild: