From 79b51e2213eeafade469436cdaf77d6fd7b5b482 Mon Sep 17 00:00:00 2001 From: Toshaan Bharvani Date: Fri, 22 Dec 2023 11:38:13 +0100 Subject: [PATCH] update to version 6.0.0 Signed-off-by: Toshaan Bharvani --- SOURCES/.gitkeeper | 0 SPECS/cinnamon-control-center.spec | 120 ++++++++++++++++++++++------- 2 files changed, 94 insertions(+), 26 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-control-center.spec b/SPECS/cinnamon-control-center.spec index fbf276f..c66d943 100644 --- a/SPECS/cinnamon-control-center.spec +++ b/SPECS/cinnamon-control-center.spec @@ -1,14 +1,19 @@ -%global _artwork_version 5.7 +%global commit0 7360582eb853682764eb4d276d9e8535c96fe763 +%global date 20231107 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global tag %{version} -%global cinnamon_desktop_version 5.2.0 -%global csd_version 5.2.0 -%global cinnamon_menus_version 5.2.0 +%global _artwork_version 1.7.5 + +%global cinnamon_desktop_version 6.0.0 +%global csd_version 6.0.0 +%global cinnamon_menus_version 6.0.0 %global redhat_menus_version 1.8 Summary: Utilities to configure the Cinnamon desktop Name: cinnamon-control-center -Version: 5.2.1 -Release: 1%{?dist} +Version: 6.0.0 +Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist} # The following files contain code from # ISC for panels/network/rfkill.h # And MIT for wacom/calibrator/calibrator.c @@ -18,8 +23,12 @@ Release: 1%{?dist} # wacom/calibrator/main.c License: GPLv2+ and LGPLv2+ and MIT and ISC URL: https://github.com/linuxmint/%{name} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Source1: http://packages.linuxmint.com/pool/main/m/mint-artwork-cinnamon/mint-artwork-cinnamon_%{_artwork_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 +Source1: http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_%{_artwork_version}.tar.xz ExcludeArch: %{ix86} @@ -39,22 +48,25 @@ BuildRequires: meson BuildRequires: intltool BuildRequires: pkgconfig(cinnamon-desktop) >= %{cinnamon_desktop_version} BuildRequires: pkgconfig(libcinnamon-menu-3.0) >= %{cinnamon_menus_version} -BuildRequires: pkgconfig(cinnamon-settings-daemon) >= %{csd_version} +BuildRequires: pkgconfig(gtk+-3.0) >= 3.16.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.44.0 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.44.0 +BuildRequires: pkgconfig(libgnomekbd) >= 3.0.0 +BuildRequires: pkgconfig(libgnomekbdui) >= 3.0.0 +BuildRequires: pkgconfig(libnotify) >= 0.7.3 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 +BuildRequires: pkgconfig(libxklavier) >= 5.1 +BuildRequires: pkgconfig(upower-glib) >= 0.99.8 +BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(libnm) >= 1.2.0 +BuildRequires: pkgconfig(libnma) >= 1.2.0 +BuildRequires: pkgconfig(mm-glib) >= 0.7 BuildRequires: pkgconfig(colord) +BuildRequires: pkgconfig(libwacom) BuildRequires: pkgconfig(goa-1.0) -BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(goa-backend-1.0) >= 3.21.5 -BuildRequires: pkgconfig(libgnomekbd) -BuildRequires: pkgconfig(libnm) >= 1.2 -BuildRequires: pkgconfig(libnma) >= 1.2 -BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(libxklavier) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(libwacom) -BuildRequires: pkgconfig(mm-glib) >= 0.7 -BuildRequires: pkgconfig(polkit-agent-1) -BuildRequires: pkgconfig(upower-glib) -BuildRequires: pkgconfig(xkbfile) %description This package contains configuration utilities for the Cinnamon desktop, which @@ -85,7 +97,11 @@ utilities for testing Metacity/Muffin themes. %prep -%autosetup -a 1 -p 1 +%if 0%{?tag:1} +%autosetup -a1 -p1 +%else +%autosetup -a1 -p1 -n %{name}-%{commit0} +%endif %build @@ -98,22 +114,23 @@ utilities for testing Metacity/Muffin themes. desktop-file-install \ --delete-original \ - --dir %{buildroot}/%{_datadir}/applications \ + --dir %{buildroot}/%{_datadir}/applications/ \ %{buildroot}/%{_datadir}/applications/*.desktop # install sound files mkdir -p %{buildroot}/%{_datadir}/cinnamon-control-center/sounds/ -install -pm 0644 mint-artwork-cinnamon-%{_artwork_version}/%{_datadir}/mint-artwork-cinnamon/sounds/* %{buildroot}/%{_datadir}/cinnamon-control-center/sounds/ +install -pm 0644 mint-artwork/%{_datadir}/mint-artwork/sounds/* %{buildroot}/%{_datadir}/cinnamon-control-center/sounds/ %files %doc AUTHORS README %license COPYING %{_bindir}/cinnamon-control-center -%{_datadir}/cinnamon-control-center/ui/ -%{_datadir}/cinnamon-control-center/sounds/*.og* %{_datadir}/applications/*.desktop +%{_datadir}/cinnamon-control-center/panels/ +%{_datadir}/cinnamon-control-center/sounds/*.og* +%{_datadir}/cinnamon-control-center/ui/ %{_datadir}/icons/hicolor/*/*/* %{_datadir}/glib-2.0/schemas/org.cinnamon.control-center.display.gschema.xml # list all binaries explicitly, so we notice if one goes missing @@ -139,6 +156,57 @@ install -pm 0644 mint-artwork-cinnamon-%{_artwork_version}/%{_datadir}/mint-artw %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.20231107git7360582 +- 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 + +* Thu Jun 08 2023 Leigh Scott - 5.8.1-1 +- Update to 5.8.1 release + +* Tue Jun 06 2023 Leigh Scott - 5.8.0-2 +- Update mint-artwork for sounds + +* 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 + +* Tue Aug 02 2022 Leigh Scott - 5.4.6-1 +- Update to 5.4.6 release + +* Wed Jul 20 2022 Fedora Release Engineering - 5.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Jul 17 2022 Leigh Scott - 5.4.4-1 +- Update to 5.4.4 release + +* Wed Jun 22 2022 Leigh Scott - 5.4.2-1 +- Update to 5.4.2 release + +* Thu Jun 16 2022 Leigh Scott - 5.4.0-2 +- Fix network crash + +* Fri Jun 10 2022 Leigh Scott - 5.4.0-1 +- Update to 5.4.0 release + +* Wed Feb 23 2022 Leigh Scott - 5.2.1-3 +- Fix network panel crash + +* Wed Jan 19 2022 Fedora Release Engineering - 5.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 16 2021 Leigh Scott - 5.2.1-1 - Update to 5.2.1 release