From 2020c0a326ed73f9394f0bf1ee613b891fccaec4 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Aug 05 2024 18:03:02 +0000 Subject: more shortcommit fixes Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 2cfb208..ae492dd 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -42,11 +42,11 @@ URL: https://github.com/pop-os/cosmic-applibrary 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index fab353a..7041c33 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -41,11 +41,11 @@ URL: https://github.com/pop-os/cosmic-applets 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml Patch: better_compile.patch diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index e980316..09f20d2 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -35,11 +35,11 @@ URL: https://github.com/pop-os/cosmic-bg 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 9b26d6b..740f493 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -46,11 +46,11 @@ URL: https://github.com/pop-os/cosmic-comp 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 6799e88..bae2630 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -46,11 +46,11 @@ URL: https://github.com/pop-os/cosmic-edit 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 1a18d5b..4ed268f 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -46,11 +46,11 @@ URL: https://github.com/pop-os/cosmic-files 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index fee014e..e57bc5d 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -42,11 +42,11 @@ URL: https://github.com/pop-os/cosmic-greeter 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml Patch: service.patch diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 502cfa4..9377e3c 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -46,11 +46,11 @@ URL: https://github.com/pop-os/cosmic-launcher Source0: https://github.com/pop-os/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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 7e4592e..3c4bd82 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -43,11 +43,11 @@ URL: https://github.com/pop-os/cosmic-notifications 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 5b1bd83..7405feb 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -44,11 +44,11 @@ URL: https://github.com/pop-os/cosmic-osd 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 68330cd..bd3db17 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -40,11 +40,11 @@ URL: https://github.com/pop-os/cosmic-panel 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 49dcd5e..14a52e4 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -32,11 +32,11 @@ URL: https://github.com/pop-os/cosmic-randr 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index e5b5aef..6ce706a 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -34,11 +34,11 @@ URL: https://github.com/pop-os/cosmic-screenshot 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 1a2bd82..10c51d9 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -38,11 +38,11 @@ URL: https://github.com/pop-os/cosmic-session 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 86486f3..73c49fe 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -43,11 +43,11 @@ URL: https://github.com/pop-os/cosmic-settings-daemon 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index b6f0268..c7938d7 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -46,11 +46,11 @@ URL: https://github.com/pop-os/cosmic-settings 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 25 diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index e05247b..b28ef46 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -44,11 +44,11 @@ URL: https://github.com/pop-os/cosmic-store 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 25 diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 328764f..ca1d596 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -45,11 +45,11 @@ URL: https://github.com/pop-os/cosmic-term 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 83d6359..82113fd 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -44,11 +44,11 @@ URL: https://github.com/pop-os/cosmic-workspaces-epoch 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index e164a94..a9ea198 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -41,11 +41,11 @@ URL: https://github.com/pop-os/launcher 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml Patch: symlink.patch 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 1b20a65..a294b46 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -44,11 +44,11 @@ URL: https://github.com/pop-os/xdg-desktop-portal-cosmic 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-%%{commit}.toml -# * tar -pczf vendor-%%{commit}.tar.gz vendor -Source1: vendor-%{commit}.tar.gz -# * mv vendor-config-%%{commit}.toml .. -Source2: vendor-config-%{commit}.toml +# * cargo vendor > vendor-config-%%{shortcommit}.toml +# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor +Source1: vendor-%{shortcommit}.tar.gz +# * mv vendor-config-%%{shortcommit}.toml .. +Source2: vendor-config-%{shortcommit}.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/scripts/srpm.sh b/scripts/srpm.sh index 7339969..ef86cb9 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -58,6 +58,6 @@ sed -i "/^%global commitdate / s/.*/%global commitdate $COMMITDATE/" $NAME.spec sed -i "/^%global commitdatestring / s/.*/%global commitdatestring $COMMITDATESTRING/" $NAME.spec # Should have these sources -# SOURCE_NAME-COMMIT.tar.gz -# vendor-%{commit}.tar.gz -# vendor-config-%{commit}.toml \ No newline at end of file +# SOURCE_NAME-SHORTCOMMIT.tar.gz +# vendor-%{shortcommit}.tar.gz +# vendor-config-%{shortcommit}.toml \ No newline at end of file