From d07717fbe5c74425306f73b5844013f48af1dbe8 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Nov 04 2018 16:44:05 +0000 Subject: Update to 4.0.0 release --- diff --git a/.gitignore b/.gitignore index d30b42c..b2a1960 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /cinnamon-3.8.7.tar.gz /cinnamon-3.8.8.tar.gz /cinnamon-3.8.9.tar.gz +/cinnamon-4.0.0.tar.gz diff --git a/cinnamon-3.8.8_port_libnm.patch b/cinnamon-3.8.8_port_libnm.patch index d5098a9..f144c9b 100644 --- a/cinnamon-3.8.8_port_libnm.patch +++ b/cinnamon-3.8.8_port_libnm.patch @@ -4,10 +4,10 @@ Date: Fri, 6 Jul 2018 09:38:56 +0100 Subject: [PATCH 1/4] Network applet: Port to libnm --- - configure.ac | 2 +- - .../applets/network@cinnamon.org/applet.js | 293 ++++++++++----------- - js/misc/modemManager.js | 4 +- - src/Makefile.am | 2 +- + configure.ac | 2 +- + .../applets/network@cinnamon.org/applet.js | 293 ++++++++---------- + js/misc/modemManager.js | 4 +- + src/Makefile.am | 2 +- 4 files changed, 139 insertions(+), 162 deletions(-) diff --git a/configure.ac b/configure.ac @@ -751,11 +751,11 @@ index 9fdfe0a06..ad314d8ba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -222,7 +222,7 @@ libcinnamon_la_LIBADD = \ - libcinnamon_la_CPPFLAGS = $(cinnamon_cflags) + libcinnamon_la_CPPFLAGS = $(MUFFIN_CFLAGS) $(cinnamon_cflags) Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir --Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0 -+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NM-1.0 +-Cinnamon_0_1_gir_INCLUDES = Clutter-0 ClutterX11-0 CoglPango-0 Cogl-0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0 ++Cinnamon_0_1_gir_INCLUDES = Clutter-0 ClutterX11-0 CoglPango-0 Cogl-0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NM-1.0 Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir) Cinnamon_0_1_gir_LIBS = libcinnamon.la Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources) @@ -766,7 +766,7 @@ Date: Fri, 6 Jul 2018 09:41:10 +0100 Subject: [PATCH 2/4] network: Support user connections --- - .../applets/network@cinnamon.org/applet.js | 32 +++++++++++++++++++--- + .../applets/network@cinnamon.org/applet.js | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js @@ -842,57 +842,13 @@ index c6c63646d..ca441cd58 100644 }, -From fa508106d085e48b722049570ca29554e5468fba Mon Sep 17 00:00:00 2001 -From: Maximiliano Curia -Date: Fri, 6 Jul 2018 09:53:10 +0100 -Subject: [PATCH 3/4] Adjust Debian Control - ---- - debian/control | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/debian/control b/debian/control -index 83f743041..a7fd7413a 100644 ---- a/debian/control -+++ b/debian/control -@@ -28,7 +28,8 @@ Build-Depends: - libgudev-1.0-dev, - libjson-glib-dev (>= 0.13.2), - libmuffin-dev (>= 3.8), -- libnm-glib-dev (>= 0.8.999), -+ libnm-dev (>= 1.6) [linux-any], -+ libnma-dev [linux-any], - libpolkit-agent-1-dev (>= 0.100), - libpulse-dev, - librsvg2-dev, -@@ -63,8 +64,8 @@ Depends: - gir1.2-gtkclutter-1.0, - gir1.2-keybinder-3.0, - gir1.2-meta-muffin-0.0 (>= ${cinnamon:Version}), -- gir1.2-networkmanager-1.0, -- gir1.2-nmgtk-1.0, -+ gir1.2-nm-1.0 [linux-any] | gir1.2-networkmanager-1.0 [linux-any], -+ gir1.2-nma-1.0 [linux-any], - gir1.2-notify-0.7, - gir1.2-polkit-1.0, - gir1.2-soup-2.4, -@@ -84,7 +85,7 @@ Depends: - mesa-utils, - metacity, - nemo (>= ${cinnamon:Version}), -- network-manager-gnome, -+ network-manager-gnome [linux-any], - policykit-1-gnome, - python3, - python3-dbus, - From c30f921431e02a2f35e6234c5500592b46f52f4e Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 22 Jul 2018 12:58:32 +0100 Subject: [PATCH 4/4] Fix mistake --- - files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js | 4 ++-- + .../usr/share/cinnamon/applets/network@cinnamon.org/applet.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js diff --git a/cinnamon.spec b/cinnamon.spec index 1905641..3b3529e 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -1,10 +1,9 @@ %global __requires_exclude ^lib%{name}.so|^lib%{name}-js.so -%global clutter_version 1.12.2 -%global cjs_version 3.8.0 -%global cinnamon_desktop_version 3.8.0 +%global cjs_version 4.0.0 +%global cinnamon_desktop_version 4.0.0 %global gobject_introspection_version 1.38.0 -%global muffin_version 3.8.0 +%global muffin_version 4.0.0 %global json_glib_version 0.13.2 # For wallpaper. @@ -14,8 +13,8 @@ %global __python %{__python3} Name: cinnamon -Version: 3.8.9 -Release: 2%{?dist} +Version: 4.0.0 +Release: 1%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} @@ -30,11 +29,11 @@ Patch2: revert_25aef37.patch Patch3: default_panal_launcher.patch Patch4: remove_crap_from_menu.patch Patch5: replace-metacity-with-openbox.patch -Patch6: %{url}/pull/7699.patch#/%{name}-3.8.8_port_libnm.patch +Patch6: set_fedora_menu_icon.patch +Patch7: %{url}/pull/7699.patch#/%{name}-3.8.8_port_libnm.patch BuildRequires: gcc-c++ -BuildRequires: pkgconfig(clutter-1.0) >= %{clutter_version} BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: desktop-file-utils BuildRequires: pkgconfig(cjs-1.0) >= %{cjs_version} @@ -281,6 +280,9 @@ EOF %changelog +* Sat Nov 03 2018 Leigh Scott - 4.0.0-1 +- Update to 4.0.0 release + * Sun Oct 07 2018 Leigh Scott - 3.8.9-2 - Drop EPEL/RHEL support diff --git a/sources b/sources index 787d038..5cc7ee3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cinnamon-3.8.9.tar.gz) = 3b07daf531819e21037ec0161c462d03bb60e0e059e6dfe5f6ab200858391c9b4a2c033e4a38f9acc83ddbedde8e54ab78a346a71718e5f4b5025061335b7f14 +SHA512 (cinnamon-4.0.0.tar.gz) = c827211aa449e6bb5c8a39b8f6711df39eefb956572900b8c90437db4e17f7c13a9e5772504ca4c689f6271ecfa22d5f453c217cbb558b89d5a9f2e2e48d191b