The package rpms/cinnamon.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cinnamon.git/commit/?id=cfb06e445....
Change:
+%ifnarch s390 s390x
Thanks.
Full change:
============
commit d6c213ad81d82363aa1501916784d51c2cbaaad0
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Nov 4 16:48:52 2018 +0000
add patch
diff --git a/set_fedora_menu_icon.patch b/set_fedora_menu_icon.patch
new file mode 100644
index 0000000..e9c06b6
--- /dev/null
+++ b/set_fedora_menu_icon.patch
@@ -0,0 +1,19 @@
+--- a/files/usr/share/cinnamon/applets/menu(a)cinnamon.org/settings-schema.json
++++ b/files/usr/share/cinnamon/applets/menu(a)cinnamon.org/settings-schema.json
+@@ -40,13 +40,13 @@
+ },
+ "menu-custom" : {
+ "type" : "switch",
+- "default" : false,
++ "default" : true,
+ "description" : "Use a custom icon and label",
+ "tooltip" : "Check this to specify a custom icon and label"
+ },
+ "menu-icon" : {
+ "type" : "iconfilechooser",
+- "default" : "/usr/share/cinnamon/theme/menu-symbolic.svg",
++ "default" : "/usr/share/cinnamon/theme/menu.svg",
+ "description" : "Icon",
+ "tooltip" : "Select an icon to show in the panel.",
+ "dependency" : "menu-custom",
+
commit d07717fbe5c74425306f73b5844013f48af1dbe8
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Nov 4 16:44:05 2018 +0000
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(a)cinnamon.org/applet.js | 293 ++++++++++-----------
- js/misc/modemManager.js | 4 +-
- src/Makefile.am | 2 +-
+ configure.ac | 2 +-
+ .../applets/network(a)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(a)cinnamon.org/applet.js | 32 +++++++++++++++++++---
+ .../applets/network(a)cinnamon.org/applet.js | 32 ++++++++++++++++---
1 file changed, 28 insertions(+), 4 deletions(-)
diff --git a/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
b/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
@@ -842,57 +842,13 @@ index c6c63646d..ca441cd58 100644
},
-From fa508106d085e48b722049570ca29554e5468fba Mon Sep 17 00:00:00 2001
-From: Maximiliano Curia <maxy(a)gnuservers.com.ar>
-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 <leigh123linux(a)fedoraproject.org>
Date: Sun, 22 Jul 2018 12:58:32 +0100
Subject: [PATCH 4/4] Fix mistake
---
- files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js | 4 ++--
+ .../usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
b/files/usr/share/cinnamon/applets/network(a)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 <leigh123linux(a)googlemail.com> - 4.0.0-1
+- Update to 4.0.0 release
+
* Sun Oct 07 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 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
commit cfb06e44527f6d4fd6be1ef138ee29eb277e62fd
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Oct 7 14:55:52 2018 +0100
Drop EPEL/RHEL support
diff --git a/cinnamon.spec b/cinnamon.spec
index 624998c..1905641 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -15,7 +15,7 @@
Name: cinnamon
Version: 3.8.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Window management and application launching for GNOME
License: GPLv2+ and LGPLv2+
URL:
https://github.com/linuxmint/%{name}
@@ -72,7 +72,7 @@ BuildRequires: gnome-common
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(colord)
-%ifnarch s390 s390x %{?rhel:ppc ppc64}
+%ifnarch s390 s390x
BuildRequires: pkgconfig(libwacom)
BuildRequires: pkgconfig(xorg-wacom)
%endif
@@ -108,11 +108,7 @@ Requires: caribou%{?_isa}
Requires: accountsservice-libs%{?_isa}
# needed for settings
-%if 0%{?fedora} || 0%{?rhel} >= 8
Requires: python3-pexpect
-%else
-Requires: pexpect
-%endif
Requires: python3-gobject%{?_isa}
Requires: python3-dbus%{?_isa}
Requires: python3-lxml%{?_isa}
@@ -151,12 +147,8 @@ Requires: python3-xapps-overrides%{?_isa}
Requires: nm-connection-editor%{?_isa}
Requires: network-manager-applet%{?_isa}
-# required for looking glass
-%if 0%{?fedora} || 0%{?rhel} >= 8
Requires: python3-inotify
-%else # 0%%{?fedora} || 0%%{?rhel} >= 8
-Requires: python-inotify
-%endif # 0%%{?fedora} || 0%%{?rhel} >= 8
+
# required for cinnamon-killer-daemon
Requires: keybinder3%{?_isa}
@@ -205,15 +197,6 @@ for file in files%{_datadir}/%{name}/%{name}-settings/bin/*.py
files%{_datadir}/
done
chmod a-x files%{_datadir}/%{name}/%{name}-settings/bin/__init__.py
-%if (0%{?rhel} && 0%{?rhel} >= 7)
-for f in $(%{__grep} -Rl '#!.*python3') ; do
- %{__sed} -e 's~#!.*python3~#!%{_bindir}/python2~g' < ${f} > ${f}.new
- /bin/touch -r ${f}.new ${f}
- mode="$(%{_bindir}/stat -c '%a' ${f})"
- %{__mv} -f ${f}.new ${f}
- %{__chmod} -c ${mode} ${f}
-done
-%endif # (0%%{?rhel} && 0%%{?rhel} >= 7)
NOCONFIGURE=1 ./autogen.sh
@@ -245,11 +228,7 @@ NOCONFIGURE=1 ./autogen.sh
-Dpm 0644 %{SOURCE2}
# install gschema-override for apps
-%if 0%{?fedora} || 0%{?rhel} >= 8
%{__sed} -e 's!@pkg_manager(a)!org.mageia.dnfdragora.desktop!g' \
-%else
-%{__sed} -e 's!@pkg_manager(a)!yumex.desktop!g' \
-%endif
< %{SOURCE3} >
%{buildroot}%{_datadir}/glib-2.0/schemas/10_%{name}-apps.gschema.override
# install gschema-override for wallpaper
@@ -277,23 +256,6 @@ EOF
%{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-%if (0%{?rhel} && 0%{?rhel <= 7})
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||
:
- %{_bindir}/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
- %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%endif
-
-
%files
%doc README.rst AUTHORS
%license COPYING
@@ -319,6 +281,9 @@ fi
%changelog
+* Sun Oct 07 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.9-2
+- Drop EPEL/RHEL support
+
* Fri Sep 21 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.9-1
- Update to 3.8.9 release