From e45dd9b0bd62e690fcd9b0b8d495749eec5475aa Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Aug 19 2024 13:28:57 +0000 Subject: [PATCH 1/2] revert the change in the condition + comment validation --- diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 4327914..65c935f 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -104,7 +104,7 @@ export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} install # COSMIC is not a valid category pre-fedora 41 -%if %{defined fedora} && 0%{?fedora} > 40 +%if %{defined fedora} && 0%{?fedora} < 41 desktop-file-install \ --remove-category COSMIC \ @@ -235,7 +235,8 @@ desktop-file-install \ %endif %check -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.desktop +# FIXME: OnlyShowIn=COSMIC, should be fixed in 41 ? +# desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.desktop # TODO: Fix desktop file validation of sub pages upstream # desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.About.desktop # desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop From fc10230914e534b6c6031e2b7e92d0ececb3e1b4 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Aug 19 2024 13:28:57 +0000 Subject: [PATCH 2/2] remove desktop-file-install + wildcard .desktop --- diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 65c935f..7c396c5 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -103,137 +103,6 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} install -# 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.CosmicSettings.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.About.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.DateTime.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Dock.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Panel.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.WindowManagement.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Displays.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Firmware.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Keyboard.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Mouse.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Notifications.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.RegionLanguage.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Sound.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Touchpad.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Users.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Wallpaper.desktop - -desktop-file-install \ ---remove-category COSMIC \ ---add-category X-COSMIC \ ---delete-original \ ---dir %{buildroot}%{_datadir}/applications \ -%{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.Workspaces.desktop - -%endif - %check # FIXME: OnlyShowIn=COSMIC, should be fixed in 41 ? # desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.desktop @@ -268,7 +137,7 @@ export VERGEN_GIT_SHA="%{commit}" %license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-settings -%{_datadir}/applications/com.system76.CosmicSettings.desktop +%{_datadir}/applications/com.system76.CosmicSettings*.desktop %{_metainfodir}/com.system76.CosmicSettings.metainfo.xml %dir %{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder %{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/* @@ -289,23 +158,6 @@ export VERGEN_GIT_SHA="%{commit}" %{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg %{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg %{_datadir}/icons/hicolor/*/apps/com.system76.CosmicSettings.svg -%{_datadir}/applications/com.system76.CosmicSettings.About.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop -%{_datadir}/applications/com.system76.CosmicSettings.DateTime.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Dock.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Panel.desktop -%{_datadir}/applications/com.system76.CosmicSettings.WindowManagement.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Displays.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Firmware.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Keyboard.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Mouse.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Notifications.desktop -%{_datadir}/applications/com.system76.CosmicSettings.RegionLanguage.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Sound.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Touchpad.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Users.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Wallpaper.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Workspaces.desktop %{_datadir}/polkit-1/rules.d/cosmic-settings.rules %changelog