From 61b070da3d876497c9a818ee08460283babea7e0 Mon Sep 17 00:00:00 2001
From: Ryan Brue <ryanbrue.dev@gmail.com>
Date: Oct 28 2024 04:28:22 +0000
Subject: [PATCH 1/2] fix: remove patch for pop-launcher


following the update of https://github.com/pop-os/launcher/pull/242, the patch will be obsolete.

do not merge until the pull request lands

Signed-off-by: Ryan Brue <ryanbrue.dev@gmail.com>

---

diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec
index e84ed6d..e1c5b7e 100644
--- a/rpms/pop-launcher/pop-launcher.spec
+++ b/rpms/pop-launcher/pop-launcher.spec
@@ -28,9 +28,6 @@ Source1:        vendor-%{shortcommit}.tar.gz
 # * mv vendor-config-%%{shortcommit}.toml ..
 Source2:        vendor-config-%{shortcommit}.toml
 
-# See: https://github.com/pop-os/launcher/pull/242
-Patch0: https://patch-diff.githubusercontent.com/raw/pop-os/launcher/pull/242.patch
-
 BuildRequires:  cargo-rpm-macros >= 25
 BuildRequires:  rustc
 BuildRequires:  lld
@@ -65,6 +62,7 @@ fi
 # Set vergen environment variables
 export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'"
 export VERGEN_GIT_SHA="%{commit}"
+export POP_LAUNCHER_LIB_DIR=/usr/libexec/pop-launcher
 just build-release --offline --frozen
 %{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
@@ -75,7 +73,7 @@ sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt
 # Set vergen environment variables
 export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'"
 export VERGEN_GIT_SHA="%{commit}"
-just rootdir=%{buildroot} install
+just rootdir=%{buildroot} lib-path=libexec install
 
 %if %{with check}
 %check

From 9aaa7fd95fe6d134642fe2f0d6c156d9b9792f98 Mon Sep 17 00:00:00 2001
From: Ryan Brue <ryanbrue.dev@gmail.com>
Date: Oct 31 2024 21:56:09 +0000
Subject: [PATCH 2/2] bump version to epoch-1.0.0~alpha.3


Signed-off-by: Ryan Brue <ryanbrue.dev@gmail.com>

---

diff --git a/scripts/no-source-srpm.sh b/scripts/no-source-srpm.sh
index 5607206..9fafbaf 100755
--- a/scripts/no-source-srpm.sh
+++ b/scripts/no-source-srpm.sh
@@ -16,7 +16,7 @@ check_variable() {
 }
 
 check_variable NAME
-VERSION=${VERSION:-"1.0.0~alpha.2"}
+VERSION=${VERSION:-"1.0.0~alpha.3"}
 NIGHTLY=${NIGHTLY:-1}
 
 CURRENT_DATE=$(date +'%Y%m%d')
diff --git a/scripts/srpm.sh b/scripts/srpm.sh
index ff44f8b..e5c67f5 100755
--- a/scripts/srpm.sh
+++ b/scripts/srpm.sh
@@ -21,7 +21,7 @@ check_variable() {
 
 check_variable NAME
 SOURCE_NAME=${SOURCE_NAME:-"$NAME"}
-VERSION=${VERSION:-"1.0.0~alpha.2"}
+VERSION=${VERSION:-"1.0.0~alpha.3"}
 VERSION_NO_TILDE=$(echo "$VERSION" | sed 's/~/-/g')
 COMMIT=${COMMIT:-"latest"}
 REPO=${REPO:-"https://github.com/pop-os/$SOURCE_NAME"}
@@ -29,7 +29,7 @@ VENDOR=${VENDOR:-1}
 NIGHTLY=${NIGHTLY:-1}
 
 if [ "$NIGHTLY" -eq 0 ]; then
-    COMMIT="epoch-1.0.0-alpha.2"
+    COMMIT="epoch-1.0.0-alpha.3"
 fi
 
 if [ ! -e "$NAME" ]; then