diff --git a/.gitignore b/.gitignore index c7e631e..c05afd6 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,4 @@ /cinnamon-5.8.2.tar.gz /cinnamon-5.8.3.tar.gz /cinnamon-5.8.4.tar.gz +/cinnamon-5a73d40.tar.gz diff --git a/0001-add-xdg-portal-conf.patch b/0001-add-xdg-portal-conf.patch index 4f09771..f0bf131 100644 --- a/0001-add-xdg-portal-conf.patch +++ b/0001-add-xdg-portal-conf.patch @@ -15,14 +15,15 @@ diff --git a/data/meson.build b/data/meson.build index b67ff1f38..506190063 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -38,6 +38,7 @@ foreach desktop_file : desktop_files - ) +@@ -40,6 +40,7 @@ endforeach + subdir('wayland_sessions') +subdir('xdg-portal') subdir('xsessions') subdir('services') + diff --git a/data/xdg-portal/meson.build b/data/xdg-portal/meson.build new file mode 100644 index 000000000..75ccf078b diff --git a/cinnamon.spec b/cinnamon.spec index 1571837..c131b1d 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -1,7 +1,7 @@ -%global commit0 77e26aea3cd0a28f382fed82791054b4115c9138 -%global date 20230606 +%global commit0 5a73d4065f3ad757053dd5db931bc1372ade724e +%global date 20231107 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global tag %{version} +#global tag %{version} %global __requires_exclude ^lib%{name}.so|^lib%{name}-js.so @@ -15,8 +15,8 @@ %global __python %{__python3} Name: cinnamon -Version: 5.8.4 -Release: 5%{!?tag:.%{date}git%{shortcommit0}}%{?dist} +Version: 5.9.0 +Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} @@ -36,9 +36,7 @@ Patch1: set_wheel.patch Patch3: default_panal_launcher.patch Patch4: remove_crap_from_menu.patch Patch5: fix_path.patch -Patch6: %url/commit/fce9aad1ebb290802dc550e8dae6344dddf9dec1.patch -Patch7: 0001-add-xdg-portal-conf.patch -Patch8: %url/commit/5eda3d4d8a65517062b48354fb17966a39ceaeca.patch +Patch6: 0001-add-xdg-portal-conf.patch ExcludeArch: %{ix86} @@ -326,6 +324,7 @@ EOF %{_datadir}/polkit-1/actions/org.%{name}.settings-users.policy %{_datadir}/xdg-desktop-portal/x-cinnamon-portals.conf %{_datadir}/xsessions/* +%{_datadir}/wayland-sessions/* %{_datadir}/%{name}/ %{_datadir}/%{name}-background-properties %{_libdir}/%{name}/ @@ -346,6 +345,9 @@ EOF %endif %changelog +* Thu Nov 09 2023 Leigh Scott - 5.9.0-1.20231107git5a73d40 +- Update to git snapshot + * Fri Oct 27 2023 Leigh Scott - 5.8.4-5 - Use libsoup3 for applets diff --git a/sources b/sources index 1cd4086..4ad25e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cinnamon-5.8.4.tar.gz) = 2eaa253cdd01f00cca05ed123db59fde27f84cc24d7b8a3ec751a5f8252642870cbece941d1101f31fe0db43c15d9779bbdcacbf7037757569a4d17205cb10ad +SHA512 (cinnamon-5a73d40.tar.gz) = 9aa45a88b799c81e0031e81da594220d851b09e52e70b28431a10e1781c602eafae55c6bbd6dc935dfc43bb3bb2a3e2b33ffd9bbaa9dec05392216f2d7faded8