diff --git a/SPECS/cinnamon-desktop.spec b/SPECS/cinnamon-desktop.spec index 6f0ea77..2724c03 100644 --- a/SPECS/cinnamon-desktop.spec +++ b/SPECS/cinnamon-desktop.spec @@ -1,23 +1,31 @@ +%global commit0 fe21fa8c0475b38522db2b7a68f11e95cca4ac91 +%global date 20231109 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global tag %{version} + %global gtk3_version 3.16.0 %global glib2_version 2.37.3 -%global startup_notification_version 0.5 %global gtk_doc_version 1.9 %global po_package cinnamon-desktop-3.0 Summary: Shared code among cinnamon-session, nemo, etc Name: cinnamon-desktop -Version: 5.2.0 -Release: 1%{?dist} +Version: 6.0.0 +Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist} License: GPLv2+ and LGPLv2+ and MIT URL: https://github.com/linuxmint/%{name} +%if 0%{?tag:1} Source0: %url/archive/%{version}/%{name}-%{version}.tar.gz +%else +Source0: %url/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz +%endif Source1: x-cinnamon-mimeapps.list ExcludeArch: %{ix86} Patch0: set_font_defaults.patch -Requires: powerel-menus +Requires: redhat-menus # Make sure to update libgnome schema when changing this %if 0%{?fedora} @@ -29,16 +37,22 @@ Requires: system-backgrounds # Make sure that gnome-themes-standard gets pulled in for upgrades Requires: gnome-themes-standard - +BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(gtk-doc) >= %{gtk_doc_version} +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(libstartup-notification-1.0) >= %{startup_notification_version} +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xkeyboard-config) -BuildRequires: pkgconfig(gtk-doc) >= %{gtk_doc_version} -BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(accountsservice) +BuildRequires: pkgconfig(xrandr) BuildRequires: meson +BuildRequires: gcc BuildRequires: intltool BuildRequires: itstool @@ -53,16 +67,16 @@ Summary: Libraries and headers for libcinnamon-desktop License: LGPLv2+ Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: gtk3-devel >= %{gtk3_version} -Requires: glib2-devel >= %{glib2_version} -Requires: startup-notification-devel >= %{startup_notification_version} - %description devel Libraries and header files for the CINNAMON-internal private library libcinnamon-desktop. %prep +%if 0%{?tag:1} %autosetup -p1 +%else +%autosetup -p1 -n %{name}-%{commit0} +%endif %build %meson -Dpnp_ids=/usr/share/hwdata/pnp.ids -Ddeprecation_warnings=false @@ -95,6 +109,48 @@ install -m 644 %SOURCE1 %buildroot%{_datadir}/applications/x-cinnamon-mimeapps.l %{_datadir}/gir-1.0/C*.gir %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.20231109gitfe21fa8 +- Update to git snapshot + +* Wed Jul 19 2023 Fedora Release Engineering - 5.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 02 2023 Leigh Scott - 5.8.0-1 +- Update to 5.8.0 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 + +* Wed Jul 20 2022 Fedora Release Engineering - 5.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 20 2022 Leigh Scott - 5.4.2-1 +- Update to 5.4.2 release + +* Sun Jul 17 2022 Leigh Scott - 5.4.1-1 +- Update to 5.4.1 release + +* Tue Jul 12 2022 Leigh Scott - 5.4.0-2 +- Fix testsound positions in cinnamon-settings + +* Fri Jun 10 2022 Leigh Scott - 5.4.0-1 +- Update to 5.4.0 release + +* Sat May 28 2022 Leigh Scott - 5.2.1-1 +- Update to 5.2.1 release + +* Wed Jan 19 2022 Fedora Release Engineering - 5.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Nov 19 2021 Leigh Scott - 5.2.0-1 - Update to 5.2.0 release