From ac47ee563b2acb98a29556ba24969fea66f6e9f4 Mon Sep 17 00:00:00 2001 From: Toshaan Bharvani Date: Mon, 25 Dec 2023 11:09:22 +0100 Subject: [PATCH] update to version 6.0.0 Signed-off-by: Toshaan Bharvani --- SOURCES/.gitkeeper | 0 SPECS/cinnamon-settings-daemon.spec | 140 ++++++++++++++++++++-------- 2 files changed, 102 insertions(+), 38 deletions(-) mode change 100644 => 100755 SOURCES/.gitkeeper diff --git a/SOURCES/.gitkeeper b/SOURCES/.gitkeeper old mode 100644 new mode 100755 diff --git a/SPECS/cinnamon-settings-daemon.spec b/SPECS/cinnamon-settings-daemon.spec index 48f0784..8c1f5c2 100644 --- a/SPECS/cinnamon-settings-daemon.spec +++ b/SPECS/cinnamon-settings-daemon.spec @@ -1,13 +1,22 @@ -%global cinnamon_desktop_version 5.2.0 +%global commit0 f5393cbc75172060a01e031ea749f94e495be16e +%global date 20231109 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global tag %{version} + +%global cinnamon_desktop_version 6.0.0 Name: cinnamon-settings-daemon -Version: 5.2.0 -Release: 1%{?dist} +Version: 6.0.0 +Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist} Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +%if 0%{?tag:1} +Source0: %url/archive/%{version}/%{name}-%{version}.tar.gz +%else +Source0: %url/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz +%endif ExcludeArch: %{ix86} @@ -15,35 +24,40 @@ ExcludeArch: %{ix86} Requires: cinnamon-desktop%{?_isa} >= %{cinnamon_desktop_version} Requires: iio-sensor-proxy%{?_isa} +BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: meson -BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: intltool +BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(cinnamon-desktop) >= %{cinnamon_desktop_version} -BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(libgnomekbd) -BuildRequires: pkgconfig(libnm) -BuildRequires: pkgconfig(libnma) -BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(libcanberra) -BuildRequires: pkgconfig(polkit-agent-1) -BuildRequires: pkgconfig(libxklavier) -BuildRequires: pkgconfig(upower-glib) +BuildRequires: pkgconfig(colord) >= 0.1.27 +BuildRequires: pkgconfig(cups) >= 1.4 +BuildRequires: pkgconfig(cvc) >= %{cinnamon_desktop_version} +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(gio-2.0) >= 2.40.0 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.40.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.40.0 +BuildRequires: pkgconfig(libgnomekbd) >= 3.6.0 +BuildRequires: pkgconfig(libgnomekbdui) >= 3.6.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(colord) >= 0.1.12 -BuildRequires: pkgconfig(lcms2) >= 2.2 -BuildRequires: pkgconfig(libsystemd) -BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(ibus-1.0) -BuildRequires: cups-devel -BuildRequires: desktop-file-utils -BuildRequires: docbook-style-xsl -BuildRequires: intltool -BuildRequires: libxslt -BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(kbproto) +BuildRequires: pkgconfig(pango) >= 1.20.0 +BuildRequires: pkgconfig(polkit-gobject-1) >= 0.97 +BuildRequires: pkgconfig(libpulse) >= 0.9.16 +BuildRequires: pkgconfig(upower-glib) >= 0.9.11 %ifnarch s390 s390x %{?rhel:ppc ppc64} -BuildRequires: pkgconfig(xorg-wacom) -BuildRequires: pkgconfig(libwacom) +BuildRequires: pkgconfig(libwacom) >= 0.7 +BuildRequires: pkgconfig(librsvg-2.0) >= 2.36.2 %endif +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(libxklavier) >= 5.0 +BuildRequires: pkgconfig(lcms2) >= 2.2 +BuildRequires: pkgconfig(libsystemd) %description A daemon to share settings from CINNAMON to other applications. It also @@ -53,14 +67,16 @@ handles global keybindings, and many of desktop-wide settings. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: dbus-glib-devel - %description devel This package contains libraries and header files for developing applications that use %{name}. %prep +%if 0%{?tag:1} %autosetup -p1 +%else +%autosetup -p1 -n %{name}-%{commit0} +%endif %build %meson \ @@ -96,33 +112,27 @@ rm -rf %{buildroot}%{_libdir}/cinnamon-settings-daemon/ %{_bindir}/csd-* %config %{_sysconfdir}/xdg/autostart/* %{_libdir}/cinnamon-settings-daemon-3.0/ -%{_libexecdir}/csd-a11y-keyboard %{_libexecdir}/csd-a11y-settings %{_libexecdir}/csd-automount %{_libexecdir}/csd-background %{_libexecdir}/csd-backlight-helper %{_libexecdir}/csd-clipboard %{_libexecdir}/csd-color -%{_libexecdir}/csd-cursor %{_libexecdir}/csd-datetime-mechanism %{_libexecdir}/csd-housekeeping %{_libexecdir}/csd-input-helper %{_libexecdir}/csd-keyboard -%{_libexecdir}/csd-locate-pointer %{_libexecdir}/csd-media-keys -%{_libexecdir}/csd-mouse -%{_libexecdir}/csd-orientation %{_libexecdir}/csd-power %{_libexecdir}/csd-printer %{_libexecdir}/csd-print-notifications %{_libexecdir}/csd-screensaver-proxy -%{_libexecdir}/csd-sound -%{_libexecdir}/csd-xrandr +%{_libexecdir}/csd-settings-remap %{_libexecdir}/csd-xsettings %ifnarch s390 s390x %{?rhel:ppc ppc64} -%{_libexecdir}/csd-list-wacom +%{_libexecdir}/csd-wacom-oled-helper +%{_libexecdir}/csd-wacom-led-helper %{_libexecdir}/csd-wacom -%{_libexecdir}/csd-wacom-osd %endif %{_datadir}/applications/csd-automount.desktop %{_datadir}/cinnamon-settings-daemon/ @@ -139,6 +149,60 @@ rm -rf %{buildroot}%{_libdir}/cinnamon-settings-daemon/ %changelog +* Sun Nov 19 2023 Leigh Scott - 6.0.0-1 +- Update to 6.0.0 release + +* Thu Nov 09 2023 Leigh Scott - 5.9.0-1.20231109gitf5393cb +- Update to git snapshot + +* Wed Jul 19 2023 Fedora Release Engineering - 5.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 23 2023 Leigh Scott - 5.8.1-1 +- Update to 5.8.1 release + +* Fri Jun 02 2023 Leigh Scott - 5.8.0-1 +- Update to 5.8.0 release + +* Fri Mar 17 2023 Leigh Scott - 5.6.2-1 +- Update to 5.6.2 release + +* Wed Jan 18 2023 Fedora Release Engineering - 5.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Jan 08 2023 Leigh Scott - 5.6.1-1 +- Update to 5.6.1 release + +* Fri Nov 18 2022 Leigh Scott - 5.6.0-1 +- Update to 5.6.0 release + +* Sat Aug 13 2022 Leigh Scott - 5.4.5-1 +- Update to 5.4.5 release + +* Tue Aug 02 2022 Leigh Scott - 5.4.4-1 +- Update to 5.4.4 release + +* Sun Jul 24 2022 Leigh Scott - 5.4.3-1 +- Update to 5.4.3 release + +* Wed Jul 20 2022 Fedora Release Engineering - 5.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Jul 17 2022 Leigh Scott - 5.4.1-1 +- Update to 5.4.1 release + +* Sat Jun 11 2022 Leigh Scott - 5.4.0-2 +- Fix dbus names + +* Fri Jun 10 2022 Leigh Scott - 5.4.0-1 +- Update to 5.4.0 release + +* Wed Jan 19 2022 Fedora Release Engineering - 5.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Dec 13 2021 Peter Hutterer - 5.2.0-2 +- Rebuild for libwacom soname bump + * Fri Nov 19 2021 Leigh Scott - 5.2.0-1 - Update to 5.2.0 release