From 30fffccf28f2edfaa59445f99c8854a8df2d22d4 Mon Sep 17 00:00:00 2001
From: Ryan Brue <ryanbrue.dev@gmail.com>
Date: Oct 04 2024 05:28:28 +0000
Subject: one more try for tonight


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

---

diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec
index dc2ccb5..ae7b197 100644
--- a/rpms/cosmic-app-library/cosmic-app-library.spec
+++ b/rpms/cosmic-app-library/cosmic-app-library.spec
@@ -21,7 +21,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-applibrary
 
-Source0:        https://github.com/pop-os/cosmic-applibrary/archive/%{shortcommit}/cosmic-applibrary-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-applibrary/archive/%{commit}/cosmic-applibrary-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-applibrary at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec
index 613d46a..6c97569 100644
--- a/rpms/cosmic-applets/cosmic-applets.spec
+++ b/rpms/cosmic-applets/cosmic-applets.spec
@@ -19,7 +19,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-applets
 
-Source0:        https://github.com/pop-os/cosmic-applets/archive/%{shortcommit}/cosmic-applets-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-applets/archive/%{commit}/cosmic-applets-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-applets at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec
index 36801df..a6898b8 100644
--- a/rpms/cosmic-bg/cosmic-bg.spec
+++ b/rpms/cosmic-bg/cosmic-bg.spec
@@ -19,7 +19,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-bg
 
-Source0:        https://github.com/pop-os/cosmic-bg/archive/%{shortcommit}/cosmic-bg-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-bg/archive/%{commit}/cosmic-bg-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-bg at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec
index 13225f5..1275fb2 100644
--- a/rpms/cosmic-comp/cosmic-comp.spec
+++ b/rpms/cosmic-comp/cosmic-comp.spec
@@ -19,7 +19,7 @@ License:        ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (0BSD OR Apache-2.0 O
 
 URL:            https://github.com/pop-os/cosmic-comp
 
-Source0:        https://github.com/pop-os/cosmic-comp/archive/%{shortcommit}/cosmic-comp-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-comp/archive/%{commit}/cosmic-comp-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-comp at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec
index 452f3d8..c24632f 100644
--- a/rpms/cosmic-edit/cosmic-edit.spec
+++ b/rpms/cosmic-edit/cosmic-edit.spec
@@ -21,7 +21,7 @@ License:        ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (0BSD OR Apache-2.0 O
 
 URL:            https://github.com/pop-os/cosmic-edit
 
-Source0:        https://github.com/pop-os/cosmic-edit/archive/%{shortcommit}/cosmic-edit-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-edit/archive/%{commit}/cosmic-edit-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-edit at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec
index 80f6adf..44b2819 100644
--- a/rpms/cosmic-files/cosmic-files.spec
+++ b/rpms/cosmic-files/cosmic-files.spec
@@ -22,7 +22,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-files
 
-Source0:        https://github.com/pop-os/cosmic-files/archive/%{shortcommit}/cosmic-files-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-files/archive/%{commit}/cosmic-files-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-files at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec
index ed7da99..8e1261e 100644
--- a/rpms/cosmic-greeter/cosmic-greeter.spec
+++ b/rpms/cosmic-greeter/cosmic-greeter.spec
@@ -20,7 +20,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-greeter
 
-Source0:        https://github.com/pop-os/cosmic-greeter/archive/%{shortcommit}/cosmic-greeter-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-greeter/archive/%{commit}/cosmic-greeter-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-greeter at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec
index e971ba8..c96c293 100644
--- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec
+++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec
@@ -15,7 +15,7 @@ License:        CC-BY-SA-4.0
 
 URL:            https://github.com/pop-os/cosmic-icons
 
-Source0:        https://github.com/pop-os/cosmic-icons/archive/%{shortcommit}/cosmic-icons-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-icons/archive/%{commit}/cosmic-icons-%{shortcommit}.tar.gz
 
 BuildArch:      noarch
 
diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec
index 12340f5..4e0a7c9 100644
--- a/rpms/cosmic-launcher/cosmic-launcher.spec
+++ b/rpms/cosmic-launcher/cosmic-launcher.spec
@@ -23,7 +23,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 URL:            https://github.com/pop-os/cosmic-launcher
 
 # Note, this is a patched cosmic-launcher while https://github.com/pop-os/launcher/pull/242 is outstanding
-Source0:        https://github.com/ryanabx/cosmic-launcher/archive/%{shortcommit}/cosmic-launcher-%{shortcommit}.tar.gz
+Source0:        https://github.com/ryanabx/cosmic-launcher/archive/%{commit}/cosmic-launcher-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-launcher at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec
index 5c3ff53..5065120 100644
--- a/rpms/cosmic-notifications/cosmic-notifications.spec
+++ b/rpms/cosmic-notifications/cosmic-notifications.spec
@@ -19,7 +19,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-notifications
 
-Source0:        https://github.com/pop-os/cosmic-notifications/archive/%{shortcommit}/cosmic-notifications-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-notifications/archive/%{commit}/cosmic-notifications-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-notifications at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec
index 7495870..f20f68d 100644
--- a/rpms/cosmic-osd/cosmic-osd.spec
+++ b/rpms/cosmic-osd/cosmic-osd.spec
@@ -22,7 +22,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-osd
 
-Source0:        https://github.com/pop-os/cosmic-osd/archive/%{shortcommit}/cosmic-osd-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-osd/archive/%{commit}/cosmic-osd-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-osd at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec
index 5487806..52373cb 100644
--- a/rpms/cosmic-panel/cosmic-panel.spec
+++ b/rpms/cosmic-panel/cosmic-panel.spec
@@ -19,7 +19,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-panel
 
-Source0:        https://github.com/pop-os/cosmic-panel/archive/%{shortcommit}/cosmic-panel-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-panel/archive/%{commit}/cosmic-panel-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-panel at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec
index d4e309c..420021e 100644
--- a/rpms/cosmic-randr/cosmic-randr.spec
+++ b/rpms/cosmic-randr/cosmic-randr.spec
@@ -19,7 +19,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-randr
 
-Source0:        https://github.com/pop-os/cosmic-randr/archive/%{shortcommit}/cosmic-randr-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-randr/archive/%{commit}/cosmic-randr-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-randr at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec
index a457681..e1715fa 100644
--- a/rpms/cosmic-screenshot/cosmic-screenshot.spec
+++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec
@@ -22,7 +22,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH L
 
 URL:            https://github.com/pop-os/cosmic-screenshot
 
-Source0:        https://github.com/pop-os/cosmic-screenshot/archive/%{shortcommit}/cosmic-screenshot-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-screenshot/archive/%{commit}/cosmic-screenshot-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-screenshot at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec
index 8b96753..459012a 100644
--- a/rpms/cosmic-session/cosmic-session.spec
+++ b/rpms/cosmic-session/cosmic-session.spec
@@ -22,7 +22,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-session
 
-Source0:        https://github.com/pop-os/cosmic-session/archive/%{shortcommit}/cosmic-session-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-session/archive/%{commit}/cosmic-session-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-session at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec
index ba6f9c3..e080fe6 100644
--- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec
+++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec
@@ -22,7 +22,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-settings-daemon
 
-Source0:        https://github.com/pop-os/cosmic-settings-daemon/archive/%{shortcommit}/cosmic-settings-daemon-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-settings-daemon/archive/%{commit}/cosmic-settings-daemon-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-settings-daemon at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec
index 28f55c2..74f6715 100644
--- a/rpms/cosmic-settings/cosmic-settings.spec
+++ b/rpms/cosmic-settings/cosmic-settings.spec
@@ -21,7 +21,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-settings
 
-Source0:        https://github.com/pop-os/cosmic-settings/archive/%{shortcommit}/cosmic-settings-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-settings/archive/%{commit}/cosmic-settings-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-settings at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec
index 1f55e45..431c96a 100644
--- a/rpms/cosmic-store/cosmic-store.spec
+++ b/rpms/cosmic-store/cosmic-store.spec
@@ -19,7 +19,7 @@ License:        ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (0BSD OR Apache-2.0 O
 
 URL:            https://github.com/pop-os/cosmic-store
 
-Source0:        https://github.com/pop-os/cosmic-store/archive/%{shortcommit}/cosmic-store-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-store/archive/%{commit}/cosmic-store-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-store at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec
index ffd064f..ad523c1 100644
--- a/rpms/cosmic-term/cosmic-term.spec
+++ b/rpms/cosmic-term/cosmic-term.spec
@@ -21,7 +21,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-term
 
-Source0:        https://github.com/pop-os/cosmic-term/archive/%{shortcommit}/cosmic-term-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-term/archive/%{commit}/cosmic-term-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-term at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec
index f9301b8..be568e1 100644
--- a/rpms/cosmic-workspaces/cosmic-workspaces.spec
+++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec
@@ -22,7 +22,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/cosmic-workspaces-epoch
 
-Source0:        https://github.com/pop-os/cosmic-workspaces-epoch/archive/%{shortcommit}/cosmic-workspaces-epoch-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/cosmic-workspaces-epoch/archive/%{commit}/cosmic-workspaces-epoch-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/cosmic-workspaces-epoch at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec
index f2a95d1..e84ed6d 100644
--- a/rpms/pop-launcher/pop-launcher.spec
+++ b/rpms/pop-launcher/pop-launcher.spec
@@ -19,7 +19,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/launcher
 
-Source0:        https://github.com/pop-os/launcher/archive/%{shortcommit}/launcher-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/launcher/archive/%{commit}/launcher-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/launcher at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec
index 9a898a6..d102adc 100644
--- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec
+++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec
@@ -22,7 +22,7 @@ License:        (0BSD OR Apache-2.0 OR MIT) AND Apache-2.0 AND (Apache-2.0 OR Ap
 
 URL:            https://github.com/pop-os/xdg-desktop-portal-cosmic
 
-Source0:        https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/%{shortcommit}/xdg-desktop-portal-cosmic-%{shortcommit}.tar.gz
+Source0:        https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/%{commit}/xdg-desktop-portal-cosmic-%{shortcommit}.tar.gz
 # To create the below sources:
 # * git clone https://github.com/pop-os/xdg-desktop-portal-cosmic at the specified commit
 # * cargo vendor > vendor-config-%%{shortcommit}.toml
diff --git a/scripts/srpm.sh b/scripts/srpm.sh
index e4d3cf1..5c4e46c 100755
--- a/scripts/srpm.sh
+++ b/scripts/srpm.sh
@@ -59,7 +59,7 @@ if [ "$VENDOR" -eq 1 ]; then
     if [ "$NIGHTLY" -eq 1 ]; then
         cargo vendor >../vendor-config-$SHORTCOMMIT.toml
     else
-        cargo vendor >../vendor-config-epoch-$VERSION_NO_TILDE.toml
+        cargo vendor >../vendor-config-$VERSION_NO_TILDE.toml
     fi
     
     # XXX: remove me once https://github.com/zip-rs/zip2/pull/238 is merged, and zip is updated in cosmic-{files, xdg-portal, edit}.
@@ -74,7 +74,7 @@ if [ "$VENDOR" -eq 1 ]; then
     if [ "$NIGHTLY" -eq 1 ]; then
         tar -pczf ../vendor-$SHORTCOMMIT.tar.gz vendor
     else
-        tar -pczf ../vendor-epoch-$VERSION_NO_TILDE.tar.gz vendor
+        tar -pczf ../vendor-$VERSION_NO_TILDE.tar.gz vendor
     fi
 fi
 
@@ -90,7 +90,9 @@ else
     sed -i "/^Version: / s/.*/Version:        $VERSION/" $NAME.spec
     # Replace shortcommit with version_no_tilde and delete shortcommit def. version_no_tilde is predefined by rpm macros
     sed -i "/^%global shortcommit /d" $NAME.spec
-    sed -i "s/%{shortcommit}/epoch-%{version_no_tilde}/g" $NAME.spec
+    # Replace commit in Source0 with epoch-%version_no_tilde
+    sed -i "/^Source0/ s/%{commit}/epoch-%{version_no_tilde}/g" $NAME.spec
+    sed -i "s/%{shortcommit}/%{version_no_tilde}/g" $NAME.spec
     # Delete commitdate, we don't need it here
     sed -i "/^%global commitdate /d" $NAME.spec
     # We still need commit, add comments explaining why