diff --git a/SOURCES/.gitkeeper b/SOURCES/.gitkeeper old mode 100644 new mode 100755 diff --git a/SPECS/cinnamon-session.spec b/SPECS/cinnamon-session.spec index c3c51fb..666e0e6 100644 --- a/SPECS/cinnamon-session.spec +++ b/SPECS/cinnamon-session.spec @@ -1,12 +1,21 @@ -%global cinnamon_desktop_version 5.2.0 +%global commit0 829519b1d36668e4a178f15900bd49af55548926 +%global date 20231109 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global tag %{version} + +%global cinnamon_desktop_version 6.0.0 Summary: Cinnamon session manager Name: cinnamon-session -Version: 5.2.0 -Release: 1%{?dist} +Version: 6.0.1 +Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist} 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} @@ -24,40 +33,42 @@ Requires: dconf Requires: cinnamon-desktop >= %{cinnamon_desktop_version} -BuildRequires: gcc -BuildRequires: pkgconfig(gtk+-3.0) >= 2.99.0 -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(libnotify) >= 0.7.0 -BuildRequires: pkgconfig(xtrans) -BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(json-glib-1.0) -# this is so the configure checks find /usr/bin/halt etc. -BuildRequires: usermode +BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0 +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.37.3 +BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xapp) >= 1.4.6 -BuildRequires: pkgconfig(xt) -BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(upower-glib) +BuildRequires: pkgconfig(xau) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xtrans) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(cinnamon-desktop) >= 6.0.0 +BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(libsystemd) -BuildRequires: pkgconfig(polkit-agent-1) -BuildRequires: pkgconfig(libcanberra) BuildRequires: meson +BuildRequires: gcc BuildRequires: intltool BuildRequires: xmlto - %description Cinnamon-session manages a Cinnamon desktop or GDM login session. It starts up the other core components and handles logout and saving the session. %prep +%if 0%{?tag:1} %autosetup -p1 +%else +%autosetup -p1 -n %{name}-%{commit0} +%endif %build -%meson \ - -Dgconf=false +%meson %meson_build %install @@ -75,12 +86,53 @@ the other core components and handles logout and saving the session. %{_libexecdir}/cinnamon-session-check-accelerated %{_libexecdir}/cinnamon-session-check-accelerated-helper %{_datadir}/cinnamon-session/ -%{_datadir}/doc/cinnamon-session/dbus/cinnamon-session.html %{_datadir}/icons/hicolor/*/apps/cinnamon-session-properties.png %{_datadir}/icons/hicolor/scalable/apps/cinnamon-session-properties.svg %{_datadir}/glib-2.0/schemas/org.cinnamon.SessionManager.gschema.xml %changelog +* Tue Nov 28 2023 Leigh Scott - 6.0.1-1 +- Update to 6.0.1 release + +* Tue Nov 28 2023 Leigh Scott - 6.0.0-3 +- Unset some environment variables on systemd + +* Wed Nov 22 2023 Leigh Scott - 6.0.0-2 +- Fix glib warning + +* 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.20231109git829519b +- 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 + +* Wed Jan 18 2023 Fedora Release Engineering - 5.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Nov 18 2022 Leigh Scott - 5.6.0-1 +- Update to 5.6.0 release + +* Sat Sep 03 2022 Leigh Scott - 5.4.0-3 +- Accept Desktop Entry Specification v1.5 + +* Wed Jul 20 2022 Fedora Release Engineering - 5.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* 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-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