From 0183e25a15fc32f276dc5f5816fb15e66f379715 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Aug 05 2024 15:28:13 +0000 Subject: [PATCH 1/2] fix: some of the review stuff re: cosmic-term 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 fd89068..5a9e31f 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -101,9 +101,15 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 -%if %{fedora} > 40 -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop +%if %{defined fedora} && 0%{?fedora} < 41 +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop %endif %files diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index eb9e2cd..4a3c734 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -110,7 +110,121 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 -%if %{fedora} > 40 +%if %{defined fedora} && 0%{?fedora} < 41 + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppList.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletInputSources.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletPower.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletTime.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop + +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicPanelLauncherButton.desktop + +%endif desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppList.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop @@ -128,7 +242,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPa desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPanelLauncherButton.desktop %endif -%endif %files %license LICENSE diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index bb50d0e..b38fddd 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -94,9 +94,15 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 -%if %{fedora} > 40 -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicBackground.desktop +%if %{defined fedora} && 0%{?fedora} < 41 +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicBackground.desktop %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicBackground.desktop %endif %files diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index dd5d136..76d1036 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -104,6 +104,14 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 +%if %{defined fedora} && 0%{?fedora} < 41 +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicEdit.desktop +%endif %if %{fedora} > 40 desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicEdit.desktop %endif diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 01abc0b..f9a87f7 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -106,9 +106,15 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 -%if %{fedora} > 40 -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicFiles.desktop +%if %{defined fedora} && 0%{?fedora} < 41 +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicFiles.desktop %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicFiles.desktop %endif %files diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index aa6f699..f8cbd52 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -106,9 +106,15 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 -%if %{fedora} > 40 -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicLauncher.desktop +%if %{defined fedora} && 0%{?fedora} < 41 +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicLauncher.desktop %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicLauncher.desktop %endif %files diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 9ef0f19..6dad888 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -101,9 +101,15 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 -%if %{fedora} > 40 -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicNotifications.desktop +%if %{defined fedora} && 0%{?fedora} < 41 +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicNotifications.desktop %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicNotifications.desktop %endif %files diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 7f602c9..e16ab9c 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -89,9 +89,15 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 -%if %{fedora} > 40 -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicScreenshot.desktop +%if %{defined fedora} && 0%{?fedora} < 41 +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicScreenshot.desktop %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicScreenshot.desktop %endif %files diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 2f3fd9f..543af3f 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -107,9 +107,15 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 -%if %{fedora} > 40 -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.desktop +%if %{defined fedora} && 0%{?fedora} < 41 +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.desktop %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.desktop %endif %files diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 2fe48fb..a51620d 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -106,9 +106,15 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 -%if %{fedora} > 40 -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicStore.desktop +%if %{defined fedora} && 0%{?fedora} < 41 +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicStore.desktop %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicStore.desktop %endif %files diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 1bc71e7..d7fa75c 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -103,9 +103,15 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 -%if %{fedora} > 40 -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicTerm.desktop +%if %{defined fedora} && 0%{?fedora} < 41 +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicTerm.desktop %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicTerm.desktop %endif %files diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 7d405ed..b849bcb 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -109,9 +109,15 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test # COSMIC is not a valid category pre-fedora 41 -%if %{fedora} > 40 -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop +%if %{defined fedora} && 0%{?fedora} < 41 +desktop-file-install \ +--remove-category COSMIC \ +--add-category X-COSMIC \ +--delete-original \ +--dir %{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop %endif %files diff --git a/scripts/no-sources-srpm.sh b/scripts/no-sources-srpm.sh index fa0711b..cd0460c 100644 --- a/scripts/no-sources-srpm.sh +++ b/scripts/no-sources-srpm.sh @@ -17,7 +17,7 @@ cp $path_to_spec $name.spec 2>/dev/null || : # Make replacements to specfile sed -i "/^Version: / s/.*/Version: $version~^%{commitdate}git%{sub %{commit} 1 7}/" $name.spec sed -i "/^%global commit / s/.*/%global commit none/" $name.spec -current_date=$(date +'%Y%m%d.%H') +current_date=$(date +'%Y%m%d') sed -i "/^%global commitdate / s/.*/%global commitdate $current_date/" $name.spec sed -i "/^%global commitdatestring / s/.*/%global commitdatestring $current_date/" $name.spec diff --git a/scripts/srpm.sh b/scripts/srpm.sh index b119901..4a6ce7a 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -27,7 +27,7 @@ fi # Reset to specified COMMIT git reset --hard $COMMIT -COMMITDATE=$(git log -1 --format=%cd --date=format:%Y%m%d.%H%M%S) +COMMITDATE=$(git log -1 --format=%cd --date=format:%Y%m%d) COMMITDATESTRING=$(git log -1 --format=%cd --date=iso) if [ "$VENDOR" -eq 1 ]; then From c3c6a5493ed7523d7d77013bfcf0e98f25b661d3 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Aug 05 2024 15:32:22 +0000 Subject: [PATCH 2/2] re: cosmic-term suggestions 2 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 5a9e31f..100fbbf 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -41,11 +41,11 @@ URL: https://github.com/pop-os/cosmic-applibrary Source0: https://github.com/pop-os/cosmic-applibrary/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-applibrary at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 4a3c734..79d6f74 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -40,11 +40,11 @@ URL: https://github.com/pop-os/cosmic-applets Source0: https://github.com/pop-os/cosmic-applets/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-applets at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 Patch: better_compile.patch diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index b38fddd..2421a17 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -34,11 +34,11 @@ URL: https://github.com/pop-os/cosmic-bg Source0: https://github.com/pop-os/cosmic-bg/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-bg at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 8913328..d64b95d 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -45,11 +45,11 @@ URL: https://github.com/pop-os/cosmic-comp Source0: https://github.com/pop-os/cosmic-comp/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-comp at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 76d1036..20b88b9 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -45,11 +45,11 @@ URL: https://github.com/pop-os/cosmic-edit Source0: https://github.com/pop-os/cosmic-edit/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-edit at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 26 @@ -112,10 +112,8 @@ desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/com.system76.CosmicEdit.desktop %endif -%if %{fedora} > 40 desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicEdit.desktop %endif -%endif %files %license LICENSE diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index f9a87f7..a4d157a 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -45,11 +45,11 @@ URL: https://github.com/pop-os/cosmic-files Source0: https://github.com/pop-os/cosmic-files/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-files at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 350622c..43c386b 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -41,11 +41,11 @@ URL: https://github.com/pop-os/cosmic-greeter Source0: https://github.com/pop-os/cosmic-greeter/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-greeter at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 Patch: service.patch diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index f8cbd52..ce8d750 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -45,11 +45,11 @@ URL: https://github.com/pop-os/cosmic-launcher Source0: https://github.com/pop-os/cosmic-launcher/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-launcher at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 6dad888..722b984 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -42,11 +42,11 @@ URL: https://github.com/pop-os/cosmic-notifications Source0: https://github.com/pop-os/cosmic-notifications/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-notifications at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 1015ae4..082fc87 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -43,11 +43,11 @@ URL: https://github.com/pop-os/cosmic-osd Source0: https://github.com/pop-os/cosmic-osd/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-osd at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 4da28a8..955dc07 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -39,11 +39,11 @@ URL: https://github.com/pop-os/cosmic-panel Source0: https://github.com/pop-os/cosmic-panel/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-panel at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 441de4f..3d549c3 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -31,11 +31,11 @@ URL: https://github.com/pop-os/cosmic-randr Source0: https://github.com/pop-os/cosmic-randr/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-randr at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index e16ab9c..0eead7b 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -33,11 +33,11 @@ URL: https://github.com/pop-os/cosmic-screenshot Source0: https://github.com/pop-os/cosmic-screenshot/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-screenshot at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index e860b81..d36dca3 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -37,11 +37,11 @@ URL: https://github.com/pop-os/cosmic-session Source0: https://github.com/pop-os/cosmic-session/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-session at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 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 a233b27..bcaec89 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -42,11 +42,11 @@ URL: https://github.com/pop-os/cosmic-settings-daemon Source0: https://github.com/pop-os/cosmic-settings-daemon/archive/%{commit}.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.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 543af3f..fbef4fe 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -45,11 +45,11 @@ URL: https://github.com/pop-os/cosmic-settings Source0: https://github.com/pop-os/cosmic-settings/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-settings at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 25 diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index a51620d..bac7da5 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -43,11 +43,11 @@ URL: https://github.com/pop-os/cosmic-store Source0: https://github.com/pop-os/cosmic-store/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-store at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 25 diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index d7fa75c..2cd9ec9 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -44,11 +44,11 @@ URL: https://github.com/pop-os/cosmic-term Source0: https://github.com/pop-os/cosmic-term/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-term at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index b849bcb..a0a1f0b 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -43,11 +43,11 @@ URL: https://github.com/pop-os/cosmic-workspaces-epoch Source0: https://github.com/pop-os/cosmic-workspaces-epoch/archive/%{commit}.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.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 1e27124..03d7f2a 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -40,11 +40,11 @@ URL: https://github.com/pop-os/launcher Source0: https://github.com/pop-os/launcher/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/launcher at the specified commit -# * cargo vendor > vendor-config.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 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 300e008..1907301 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -43,11 +43,11 @@ URL: https://github.com/pop-os/xdg-desktop-portal-cosmic Source0: https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/%{commit}.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.toml -# * tar -pczf vendor.tar.gz vendor -Source1: vendor.tar.gz -# * mv vendor-config.toml .. -Source2: vendor-config.toml +# * 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 BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/scripts/srpm.sh b/scripts/srpm.sh index 4a6ce7a..70c5117 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -33,8 +33,8 @@ COMMITDATESTRING=$(git log -1 --format=%cd --date=iso) if [ "$VENDOR" -eq 1 ]; then echo "VENDOR=1" # Vendor dependencies and zip vendor - cargo vendor > ../vendor-config.toml - tar -pczf vendor.tar.gz vendor && mv vendor.tar.gz ../vendor.tar.gz + cargo vendor > ../vendor-config-$COMMIT.toml + tar -pczf vendor-$COMMIT.tar.gz vendor && mv vendor-$COMMIT.tar.gz ../vendor-$COMMIT.tar.gz # Back into parent directory rm -rf vendor cd .. @@ -55,5 +55,5 @@ sed -i "/^%global commitdatestring / s/.*/%global commitdatestring $COMMITDATEST # Should have these sources # SOURCE_NAME-COMMIT.tar.gz -# vendor.tar.gz -# vendor-config.toml \ No newline at end of file +# vendor-%{commit}.tar.gz +# vendor-config-%{commit}.toml \ No newline at end of file