Browse Source

update to version 6.0.2

Signed-off-by: Toshaan Bharvani <toshaan@powerel.org>
master
Toshaan Bharvani 10 months ago
parent
commit
3e7d12e15f
  1. 7
      SOURCES/10_cinnamon-common.gschema.override
  2. 102
      SOURCES/22_fedora.styles
  3. 10
      SOURCES/autostart.patch
  4. BIN
      SOURCES/cinnamon-5.2.7.tar.gz
  5. 4
      SOURCES/default_panal_launcher.patch
  6. 37
      SOURCES/fix_path.patch
  7. 18
      SOURCES/set_wheel.patch
  8. 273
      SPECS/cinnamon.spec

7
SOURCES/10_cinnamon-common.gschema.override

@ -1,5 +1,4 @@ @@ -1,5 +1,4 @@
[org.cinnamon]
desktop-effects-minimize-effect='traditional'
number-workspaces=4
startup-animation=true
workspace-expo-view-as-grid=true
@ -8,6 +7,7 @@ enabled-applets=['panel1:left:0:menu@cinnamon.org', 'panel1:left:1:show-desktop@ @@ -8,6 +7,7 @@ enabled-applets=['panel1:left:0:menu@cinnamon.org', 'panel1:left:1:show-desktop@
app-menu-label='Menu'
app-menu-icon-name='fedora-logo-sprite'
panels-height=['1:26']
system-icon='fedora-logo-sprite'

[org.cinnamon.sounds]
login-enabled=true
@ -61,16 +61,15 @@ menus-have-icons=true @@ -61,16 +61,15 @@ menus-have-icons=true
font-name='Noto Sans 9'
gtk-overlay-scrollbars=false
gtk-theme='Mint-Y-Dark-Aqua'
icon-theme='Mint-Y-Dark-Aqua'
icon-theme='Mint-Y-Aqua'

[org.cinnamon.desktop.wm.preferences]
button-layout=':minimize,maximize,close'
titlebar-font='Noto Sans Bold 10'
theme='Mint-Y'

[org.cinnamon.SessionManager]
quit-delay-toggle=true
prefer-hybrid-sleep=true
prefer-hybrid-sleep=false

[org.cinnamon.settings-daemon.plugins.xsettings]
hinting='slight'

102
SOURCES/22_fedora.styles

@ -0,0 +1,102 @@ @@ -0,0 +1,102 @@
{
"styles": [
{
"name": "Mint-X",
"mixed": [
{"name": "blue", "color": "#5b73c4", "themes": "Mint-X-Blue", "cinnamon": "Linux Mint", "cursor": "Adwaita"},
{"name": "aqua", "color": "#6cabcd", "themes": "Mint-X-Aqua", "cinnamon": "Linux Mint", "cursor": "Adwaita"},
{"name": "teal", "color": "#5aaa9a", "themes": "Mint-X-Teal", "cinnamon": "Linux Mint", "cursor": "Adwaita"},
{"name": "green", "color": "#9ab87c", "themes": "Mint-X", "cinnamon": "Linux Mint", "cursor": "Adwaita", "default": "true"},
{"name": "sand", "color": "#c8ac69", "themes": "Mint-X-Sand", "cinnamon": "Linux Mint", "cursor": "Adwaita"},
{"name": "brown", "color": "#aa876a", "themes": "Mint-X-Brown", "cinnamon": "Linux Mint", "cursor": "Adwaita"},
{"name": "grey", "color": "#9d9d9d", "themes": "Mint-X-Grey", "cinnamon": "Linux Mint", "cursor": "Adwaita"},
{"name": "orange", "color": "#db9d61", "themes": "Mint-X-Orange", "cinnamon": "Linux Mint", "cursor": "Adwaita"},
{"name": "red", "color": "#c15b58", "themes": "Mint-X-Red", "cinnamon": "Linux Mint", "cursor": "Adwaita"},
{"name": "pink", "color": "#c76199", "themes": "Mint-X-Pink", "cinnamon": "Linux Mint", "cursor": "Adwaita"},
{"name": "purple", "color": "#8c6ec9", "themes": "Mint-X-Purple", "cinnamon": "Linux Mint", "cursor": "Adwaita"}
],
"light": [
{"name": "blue", "color": "#5b73c4", "themes": "Mint-X-Blue", "cursor": "Adwaita"},
{"name": "aqua", "color": "#6cabcd", "themes": "Mint-X-Aqua", "cursor": "Adwaita"},
{"name": "teal", "color": "#5aaa9a", "themes": "Mint-X-Teal", "cursor": "Adwaita"},
{"name": "green", "color": "#9ab87c", "themes": "Mint-X", "cursor": "Adwaita", "default": "true"},
{"name": "sand", "color": "#c8ac69", "themes": "Mint-X-Sand", "cursor": "Adwaita"},
{"name": "brown", "color": "#aa876a", "themes": "Mint-X-Brown", "cursor": "Adwaita"},
{"name": "grey", "color": "#9d9d9d", "themes": "Mint-X-Grey", "cursor": "Adwaita"},
{"name": "orange", "color": "#db9d61", "themes": "Mint-X-Orange", "cursor": "Adwaita"},
{"name": "red", "color": "#c15b58", "themes": "Mint-X-Red", "cursor": "Adwaita"},
{"name": "pink", "color": "#c76199", "themes": "Mint-X-Pink", "cursor": "Adwaita"},
{"name": "purple", "color": "#8c6ec9", "themes": "Mint-X-Purple", "cursor": "Adwaita"}
]
},
{
"name": "Mint-Y",
"default": "mixed",
"mixed": [
{"name": "blue", "color": "#0c75de", "themes": "Mint-Y-Blue", "cinnamon": "Mint-Y-Dark-Blue", "cursor": "Adwaita"},
{"name": "navy", "color": "#004988", "color2": "#b8d8eb", "themes": "Mint-Y-Blue", "icons": "Mint-Y-Navy", "cinnamon": "Mint-Y-Dark-Blue", "cursor": "Adwaita"},
{"name": "aquasand", "color": "#1f9ede", "color2": "#f9c470", "themes": "Mint-Y-Aqua", "icons": "Mint-Y-Sand", "cinnamon": "Mint-Y-Dark-Aqua", "cursor": "Adwaita", "default": "true"},
{"name": "aqua", "color": "#1f9ede", "themes": "Mint-Y-Aqua", "cinnamon": "Mint-Y-Dark-Aqua", "cursor": "Adwaita"},
{"name": "teal", "color": "#199ca8", "themes": "Mint-Y-Teal", "cinnamon": "Mint-Y-Dark-Teal", "cursor": "Adwaita"},
{"name": "cyan", "color": "#199ca8", "color2": "#00bcd4", "themes": "Mint-Y-Teal", "icons": "Mint-Y-Cyan", "cinnamon": "Mint-Y-Dark-Teal", "cursor": "Adwaita"},
{"name": "green", "color": "#35a854", "themes": "Mint-Y", "cinnamon": "Mint-Y-Dark", "cursor": "Adwaita"},
{"name": "sand", "color": "#c5a07c", "themes": "Mint-Y-Sand", "cinnamon": "Mint-Y-Dark-Sand", "cursor": "Adwaita"},
{"name": "grey", "color": "#70737a", "themes": "Mint-Y-Grey", "cinnamon": "Mint-Y-Dark-Grey", "cursor": "Adwaita"},
{"name": "orange", "color": "#ff7139", "themes": "Mint-Y-Orange", "cinnamon": "Mint-Y-Dark-Orange", "cursor": "Adwaita"},
{"name": "yaru", "color": "#ff7139", "color2": "#676767", "themes": "Mint-Y-Orange", "icons": "Mint-Y-Yaru", "cinnamon": "Mint-Y-Dark-Orange", "cursor": "Adwaita"},
{"name": "red", "color": "#e82127", "themes": "Mint-Y-Red", "cinnamon": "Mint-Y-Dark-Red", "cursor": "Adwaita"},
{"name": "pink", "color": "#e54980", "themes": "Mint-Y-Pink", "cinnamon": "Mint-Y-Dark-Pink", "cursor": "Adwaita"},
{"name": "purple", "color": "#8c5dd9", "themes": "Mint-Y-Purple", "cinnamon": "Mint-Y-Dark-Purple", "cursor": "Adwaita"}
],
"dark": [
{"name": "blue", "color": "#0c75de", "themes": "Mint-Y-Dark-Blue", "icons": "Mint-Y-Blue", "cursor": "Adwaita"},
{"name": "navy", "color": "#004988", "color2": "#b8d8eb", "themes": "Mint-Y-Dark-Blue", "icons": "Mint-Y-Navy", "cursor": "Adwaita"},
{"name": "aquasand", "color": "#1f9ede", "color2": "#f9c470", "themes": "Mint-Y-Dark-Aqua", "icons": "Mint-Y-Sand", "cursor": "Adwaita", "default": "true"},
{"name": "aqua", "color": "#1f9ede", "themes": "Mint-Y-Dark-Aqua", "icons": "Mint-Y-Aqua", "cursor": "Adwaita"},
{"name": "teal", "color": "#199ca8", "themes": "Mint-Y-Dark-Teal", "icons": "Mint-Y-Teal", "cursor": "Adwaita"},
{"name": "cyan", "color": "#199ca8", "color2": "#00bcd4", "themes": "Mint-Y-Dark-Teal", "icons": "Mint-Y-Cyan", "cursor": "Adwaita"},
{"name": "green", "color": "#35a854", "themes": "Mint-Y-Dark", "icons": "Mint-Y", "cursor": "Adwaita"},
{"name": "sand", "color": "#c5a07c", "themes": "Mint-Y-Dark-Sand", "icons": "Mint-Y-Sand", "cursor": "Adwaita"},
{"name": "grey", "color": "#70737a", "themes": "Mint-Y-Dark-Grey", "icons": "Mint-Y-Grey", "cursor": "Adwaita"},
{"name": "orange", "color": "#ff7139", "themes": "Mint-Y-Dark-Orange", "icons": "Mint-Y-Orange", "cursor": "Adwaita"},
{"name": "yaru", "color": "#ff7139", "color2": "#676767", "themes": "Mint-Y-Dark-Orange", "icons": "Mint-Y-Yaru", "cursor": "Adwaita"},
{"name": "red", "color": "#e82127", "themes": "Mint-Y-Dark-Red", "icons": "Mint-Y-Red", "cursor": "Adwaita"},
{"name": "pink", "color": "#e54980", "themes": "Mint-Y-Dark-Pink", "icons": "Mint-Y-Pink", "cursor": "Adwaita"},
{"name": "purple", "color": "#8c5dd9", "themes": "Mint-Y-Dark-Purple", "icons": "Mint-Y-Purple", "cursor": "Adwaita"}
],
"light": [
{"name": "blue", "color": "#0c75de", "themes": "Mint-Y-Blue", "cursor": "Adwaita"},
{"name": "navy", "color": "#004988", "color2": "#b8d8eb", "themes": "Mint-Y-Blue", "icons": "Mint-Y-Navy", "cursor": "Adwaita"},
{"name": "aquasand", "color": "#1f9ede", "color2": "#f9c470", "themes": "Mint-Y-Aqua", "icons": "Mint-Y-Sand", "cursor": "Adwaita", "default": "true"},
{"name": "aqua", "color": "#1f9ede", "themes": "Mint-Y-Aqua", "cursor": "Adwaita"},
{"name": "teal", "color": "#199ca8", "themes": "Mint-Y-Teal", "cursor": "Adwaita"},
{"name": "cyan", "color": "#199ca8", "color2": "#00bcd4", "themes": "Mint-Y-Teal", "icons": "Mint-Y-Cyan", "cursor": "Adwaita"},
{"name": "green", "color": "#35a854", "themes": "Mint-Y", "cursor": "Adwaita"},
{"name": "sand", "color": "#c5a07c", "themes": "Mint-Y-Sand", "cursor": "Adwaita"},
{"name": "grey", "color": "#70737a", "themes": "Mint-Y-Grey", "cursor": "Adwaita"},
{"name": "orange", "color": "#ff7139", "themes": "Mint-Y-Orange", "cursor": "Adwaita"},
{"name": "yaru", "color": "#ff7139", "color2": "#676767", "themes": "Mint-Y-Orange", "icons": "Mint-Y-Yaru", "cursor": "Adwaita"},
{"name": "red", "color": "#e82127", "themes": "Mint-Y-Red", "cursor": "Adwaita"},
{"name": "pink", "color": "#e54980", "themes": "Mint-Y-Pink", "cursor": "Adwaita"},
{"name": "purple", "color": "#8c5dd9", "themes": "Mint-Y-Purple", "cursor": "Adwaita"}
]
},
{
"name": "Adwaita",
"default": "mixed",
"mixed": [
{"default": "true", "name": "blue", "color": "#3584e4", "themes": "Adwaita", "cinnamon": "Mint-Y-Dark-Blue", "cursor": "Adwaita"}
],
"dark": [
{"name": "blue", "color": "#15539e", "themes": "Adwaita-dark", "icons": "Adwaita", "cinnamon": "Mint-Y-Dark-Blue", "cursor": "Adwaita"}
]
},
{
"name": "HighContrast",
"default": "light",
"light": [
{"default": "true", "name": "contrast", "color": "#000000", "themes": "HighContrast", "cinnamon": "Mint-Y-Dark-Grey", "cursor": "Adwaita"}
]
}
]
}

10
SOURCES/autostart.patch

@ -17,4 +17,14 @@ @@ -17,4 +17,14 @@
+RequiredComponents=cinnamon2d;org.cinnamon.ScreenSaver;polkit-cinnamon-authentication-agent-1;nemo-autostart;@REQUIRED@cinnamon-killer-daemon;
DesktopName=X-Cinnamon
--- a/cinnamon-wayland.session.in
+++ b/cinnamon-wayland.session.in
@@ -1,5 +1,5 @@
[Cinnamon Session]
Name=Cinnamon
-RequiredComponents=cinnamon-wayland;nemo-autostart;@REQUIRED@
+RequiredComponents=cinnamon-wayland;polkit-cinnamon-authentication-agent-1;nemo-autostart;@REQUIRED@
DesktopName=X-Cinnamon



BIN
SOURCES/cinnamon-5.2.7.tar.gz

Binary file not shown.

4
SOURCES/default_panal_launcher.patch

@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
},
"pinned-apps": {
"type": "generic",
- "default": ["firefox.desktop", "org.gnome.Terminal.desktop", "nemo.desktop"]
+ "default": ["firefox.desktop", "mozilla-thunderbird.desktop", "org.gnome.Terminal.desktop", "nemo.desktop"]
- "default": ["nemo.desktop", "firefox.desktop", "org.gnome.Terminal.desktop"]
+ "default": ["nemo.desktop", "firefox.desktop", "mozilla-thunderbird.desktop", "org.gnome.Terminal.desktop"]
},
"group-apps": {
"type": "checkbox",

37
SOURCES/fix_path.patch

@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
--- a/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
+++ b/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
@@ -15,9 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/
-import platform
import os
-import sysconfig
from gi.repository import Gio, GObject
@@ -26,23 +24,7 @@ class CManager:
def __init__(self):
self.extension_point = Gio.io_extension_point_register ("cinnamon-control-center-1")
self.modules = []
-
- architecture = platform.machine()
- # get the arch-specific triplet, e.g. 'x86_64-linux-gnu' or 'arm-linux-gnueabihf'
- # see also: https://wiki.debian.org/Python/MultiArch
- triplet = sysconfig.get_config_var('MULTIARCH')
- paths = ["/usr/lib", f"/usr/lib/{triplet}"]
-
- # On x86 archs, iterate through multiple paths
- # For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu
- x86archs = ["i386", "i486", "i586", "i686"]
- if architecture in x86archs:
- for arch in x86archs:
- paths += ["/usr/lib/%s" % arch]
- elif architecture == "x86_64":
- paths += ["/usr/lib/x86_64", "/usr/lib64"]
- else:
- paths += ["/usr/lib/%s" % architecture]
+ paths = ["/usr/lib", "/usr/lib64"]
for path in paths:
if not os.path.islink(path):

18
SOURCES/set_wheel.patch

@ -1,8 +1,6 @@ @@ -1,8 +1,6 @@
Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
===================================================================
--- Cinnamon-3.6.6.orig/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+++ Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
@@ -153,12 +153,11 @@
--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
@@ -182,12 +182,11 @@
class PasswordDialog(Gtk.Dialog):
@ -16,7 +14,7 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon- @@ -16,7 +14,7 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-
self.set_modal(True)
self.set_skip_taskbar_hint(True)
@@ -224,14 +223,7 @@
@@ -253,14 +252,7 @@
def change_password(self):
newpass = self.new_password.get_text()
self.user.set_password(newpass, "")
@ -32,18 +30,18 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon- @@ -32,18 +30,18 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-
self.destroy()
def set_passwords_visibility(self):
@@ -570,7 +562,7 @@
@@ -613,7 +605,7 @@
model, treeiter = self.users_treeview.get_selection().get_selected()
if treeiter != None:
if treeiter is not None:
user = model[treeiter][INDEX_USER_OBJECT]
- dialog = PasswordDialog(user, self.password_mask, self.groups_label, self.window)
+ dialog = PasswordDialog(user, self.password_mask, self.window)
response = dialog.run()
def _on_groups_button_clicked(self, widget):
@@ -839,11 +831,11 @@
@@ -902,11 +894,11 @@
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
description = "<b>%s</b>\n%s" % (fullname, username)
description = "<b>%s</b>\n%s" % (GLib.markup_escape_text(fullname), GLib.markup_escape_text(username))
piter = self.users.append(None, [new_user, pixbuf, description])
- # Add the user to his/her own group and sudo if Administrator was selected
+ # Add the user to his/her own group and wheel if Administrator was selected

273
SPECS/cinnamon.spec

@ -1,30 +1,41 @@ @@ -1,30 +1,41 @@
%global commit0 5a73d4065f3ad757053dd5db931bc1372ade724e
%global date 20231107
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global tag %{version}

%global __requires_exclude ^lib%{name}.so|^lib%{name}-js.so

%global cjs_version 5.2.0
%global cinnamon_desktop_version 5.2.0
%global cinnamon_translations_version 5.2.0
%global cjs_version 6.0.0
%global cinnamon_desktop_version 6.0.0
%global cinnamon_translations_version 6.0.0
%global gobject_introspection_version 1.38.0
%global muffin_version 5.2.0
%global muffin_version 6.0.0
%global json_glib_version 0.13.2

%global __python %{__python3}

Name: cinnamon
Version: 5.2.7
Release: 1%{?dist}
Version: 6.0.2
Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: Window management and application launching for GNOME
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
Source1: polkit-%{name}-authentication-agent-1.desktop
Source2: 10_cinnamon-common.gschema.override
Source3: 10_cinnamon-apps.gschema.override.in
Source4: 22_fedora.styles

Patch0: autostart.patch
Patch1: set_wheel.patch
#Patch2: revert_25aef37.patch
Patch3: default_panal_launcher.patch
Patch4: remove_crap_from_menu.patch
Patch5: fix_path.patch

ExcludeArch: %{ix86}

@ -35,7 +46,6 @@ BuildRequires: python3-rpm-macros @@ -35,7 +46,6 @@ BuildRequires: python3-rpm-macros
BuildRequires: pkgconfig(cjs-1.0) >= %{cjs_version}
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(gnome-bluetooth-1.0)
BuildRequires: pkgconfig(libgnome-menu-3.0)
BuildRequires: pkgconfig(lib%{name}-menu-3.0)
BuildRequires: pkgconfig(%{name}-desktop) >= %{cinnamon_desktop_version}
@ -45,16 +55,16 @@ BuildRequires: pkgconfig(upower-glib) @@ -45,16 +55,16 @@ BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(libnm)
BuildRequires: pkgconfig(polkit-agent-1)
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(xapp)

# for screencast recorder functionality
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: intltool
BuildRequires: pkgconfig(libcanberra)
BuildRequires: pkgconfig(libsoup-2.4)

# used in unused BigThemeImage
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libmuffin) >= %{muffin_version}
BuildRequires: pkgconfig(libmuffin-0) >= %{muffin_version}
BuildRequires: pkgconfig(libpulse)

# Bootstrap requirements
@ -71,6 +81,7 @@ BuildRequires: pkgconfig(xorg-wacom) @@ -71,6 +81,7 @@ BuildRequires: pkgconfig(xorg-wacom)
%endif
BuildRequires: pkgconfig(xtst)


Requires: %{name}-desktop%{?_isa} >= %{cinnamon_desktop_version}
Requires: muffin%{?_isa} >= %{muffin_version}
Requires: cjs%{?_isa} >= %{cjs_version}
@ -101,6 +112,7 @@ Requires: caribou%{?_isa} @@ -101,6 +112,7 @@ Requires: caribou%{?_isa}
Requires: accountsservice-libs%{?_isa}

# needed for settings
Requires: gsound
Requires: libtimezonemap%{?_isa}
Requires: python3-distro
Requires: python3-pytz
@ -111,6 +123,7 @@ Requires: python3-lxml%{?_isa} @@ -111,6 +123,7 @@ Requires: python3-lxml%{?_isa}
Requires: python3-pillow%{?_isa}
Requires: python3-pam
Requires: python3-tinycss2
Requires: python3-requests
Requires: python3-setproctitle%{?_isa}
Requires: python3-xapp
Requires: mintlocale
@ -118,34 +131,30 @@ Requires: %{name}-control-center%{?_isa} @@ -118,34 +131,30 @@ Requires: %{name}-control-center%{?_isa}
Requires: %{name}-translations >= %{cinnamon_translations_version}

# needed for theme overrides
%if 0%{?fedora}
Requires: desktop-backgrounds-basic
Requires: desktop-backgrounds-gnome
%endif
Requires: gnome-backgrounds
Requires: system-logos

# Theming
Requires: google-noto-sans-fonts
%if 0%{?fedora}
Requires: %{name}-themes >= 1:1.7.4-0.2.20181112gitb94b890
%endif

# RequiredComponents in the session files
Requires: nemo%{?_isa}
Requires: %{name}-screensaver%{?_isa}

# metacity and tint2 are needed for fallback
# metacity and mate-panel are needed for fallback
Requires: metacity%{?_isa}
Requires: tint2%{?_isa}
Requires: mate-panel%{?_isa}

# required for keyboard applet
Requires: gucharmap%{?_isa}
Requires: xapps%{?_isa}
Requires: python3-xapps-overrides%{?_isa}

# required for calendar applet
Recommends: gnome-calendar
# required for calendar applet events
Recommends: %{name}-calendar-server%{?_isa} = %{version}-%{release}

# required for network applet
Requires: nm-connection-editor%{?_isa}
@ -163,6 +172,17 @@ Requires: wget%{?_isa} @@ -163,6 +172,17 @@ Requires: wget%{?_isa}
# required for printer applet
Requires: cups-client%{?_isa}

# required for spice
Requires: gettext

# required for gesture support
Recommends: touchegg

# required for flatpak support
Recommends: xdg-desktop-portal-xapp

Requires: libsoup3

Provides: desktop-notification-daemon
Provides: bundled(libcroco) = 0.6.12

@ -175,16 +195,31 @@ The underlying technology is forked from Gnome Shell. @@ -175,16 +195,31 @@ The underlying technology is forked from Gnome Shell.
The emphasis is put on making users feel at home and providing
them with an easy to use and comfortable desktop experience.

%package calendar-server
Summary: Calendar server for Cinnamon
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: evolution-data-server%{?_isa}
Requires: gnome-calendar%{?_isa}

%description calendar-server
Calendar server for Cinnamon.

%if 0%{?fedora} && 0%{?fedora} < 40
%package devel-doc
Summary: Development Documentation files for Cinnamon
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Summary: Development Documentation files for Cinnamon
BuildArch: noarch
Requires: %{name} = %{version}-%{release}

%description devel-doc
This package contains the code documentation for various Cinnamon components.
%endif

%prep
%if 0%{?tag:1}
%autosetup -p1
%else
%autosetup -p1 -n %{name}-%{commit0}
%endif

%{__sed} -i -e 's@gksu@pkexec@g' files%{_bindir}/%{name}-settings-users
%{__sed} -i -e 's@gnome-orca@orca@g' files%{_datadir}/%{name}/%{name}-settings/modules/cs_accessibility.py
@ -203,13 +238,18 @@ chmod a-x files%{_datadir}/%{name}/%{name}-settings/bin/__init__.py @@ -203,13 +238,18 @@ chmod a-x files%{_datadir}/%{name}/%{name}-settings/bin/__init__.py
--libexecdir=%{_libexecdir}/cinnamon/ \
-Ddeprecated_warnings=false \
-Dpy3modules_dir=%{python3_sitelib} \
%if 0%{?fedora} && 0%{?fedora} < 40
-Ddocs=true
%else
-Ddocs=false
%endif

%meson_build


%install
%meson_install
%py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/

# install polkit autostart desktop file
%{__install} --target-directory=%{buildroot}%{_datadir}/applications \
@ -229,9 +269,14 @@ chmod a-x files%{_datadir}/%{name}/%{name}-settings/bin/__init__.py @@ -229,9 +269,14 @@ chmod a-x files%{_datadir}/%{name}/%{name}-settings/bin/__init__.py
picture-uri='file:///usr/share/backgrounds/tiles/default_blue.jpg'
EOF

# install style file for mint-x and mint-y
%{__install} --target-directory=%{buildroot}%{_datadir}/%{name}/styles.d/ \
-Dpm 0644 %{SOURCE4}

# Provide symlink for the background-propeties.
%{__ln_s} %{_datadir}/gnome-background-properties %{buildroot}%{_datadir}/%{name}-background-properties

# Delete useless gir files
%{__rm} -rf %{buildroot}%{_datadir}/gir-1.0/

%check
%{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
@ -240,27 +285,201 @@ EOF @@ -240,27 +285,201 @@ EOF
%files
%doc README.rst AUTHORS
%license COPYING
%{_bindir}/*
%{_bindir}/cinnamon
%{_bindir}/cinnamon-close-dialog
%{_bindir}/cinnamon-dbus-command
%{_bindir}/cinnamon-desktop-editor
%{_bindir}/cinnamon-display-changes-dialog
%{_bindir}/cinnamon-file-dialog
%{_bindir}/cinnamon-hover-click
%{_bindir}/cinnamon-install-spice
%{_bindir}/cinnamon-json-makepot
%{_bindir}/cinnamon-killer-daemon
%{_bindir}/cinnamon-launcher
%{_bindir}/cinnamon-looking-glass
%{_bindir}/cinnamon-menu-editor
%{_bindir}/cinnamon-preview-gtk-theme
%{_bindir}/cinnamon-screensaver-lock-dialog
%{_bindir}/cinnamon-session-cinnamon
%{_bindir}/cinnamon-session-cinnamon2d
%{_bindir}/cinnamon-settings
%{_bindir}/cinnamon-settings-users
%{_bindir}/cinnamon-slideshow
%{_bindir}/cinnamon-spice-updater
%{_bindir}/cinnamon-subprocess-wrapper
%{_bindir}/cinnamon-xlet-makepot
%{_bindir}/cinnamon2d
%{_bindir}/xlet-about-dialog
%{_bindir}/xlet-settings
%config(noreplace) %{_sysconfdir}/xdg/menus/*
%{_datadir}/applications/*
%{_datadir}/dbus-1/services/org.*.service
%{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
%{_datadir}/dbus-1/services/org.Cinnamon.Melange.service
%{_datadir}/dbus-1/services/org.Cinnamon.Slideshow.service
%{_datadir}/desktop-directories/*
%{_datadir}/glib-2.0/schemas/*
%{_datadir}/%{name}-session/sessions/*
%{_datadir}/icons/hicolor/*/*/*.svg
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/polkit-1/actions/org.%{name}.settings-users.policy
%{_datadir}/xdg-desktop-portal/x-cinnamon-portals.conf
%{_datadir}/xsessions/*
%{_datadir}/wayland-sessions/*
%{_datadir}/%{name}/
%{_datadir}/%{name}-background-properties
%{_libdir}/%{name}/
%{_libexecdir}/%{name}/
%dir %{_libexecdir}/%{name}/
%{_libexecdir}/cinnamon/cinnamon-hotplug-sniffer
%{_libexecdir}/cinnamon/cinnamon-perf-helper
%{_mandir}/man1/*
%{python3_sitelib}/cinnamon/
%{python3_sitelib}/%{name}/

%files calendar-server
%{_bindir}/%{name}-calendar-server
%{_libexecdir}/%{name}/%{name}-calendar-server.py
%{_datadir}/dbus-1/services/org.%{name}.CalendarServer.service

%if 0%{?fedora} && 0%{?fedora} < 40
%files devel-doc
%doc %{_datadir}/gtk-doc/html/*/
%endif

%changelog
* Tue Dec 19 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0.2-1
- Update to 6.0.2 release

* Wed Nov 29 2023 Leigh Scott <leigh123linux@gmail.com> - 6.0.0-1
- Update to 6.0.0 release

* Fri Nov 10 2023 Leigh Scott <leigh123linux@gmail.com> - 5.9.0-2.20231107git5a73d40
- Rebuild against correct muffin

* Thu Nov 09 2023 Leigh Scott <leigh123linux@gmail.com> - 5.9.0-1.20231107git5a73d40
- Update to git snapshot

* Fri Oct 27 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.4-5
- Use libsoup3 for applets

* Sun Sep 24 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.4-4
- Add xdg-portal conf file

* Wed Jul 19 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.4-3
- Add fedora styles file

* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

* Sun Jul 09 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.4-1
- Update to 5.8.4 release

* Thu Jul 06 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.3-1
- Update to 5.8.3 release
- Revert 'Default disable desktop effects

* Wed Jul 05 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.2-2
- Rebuilt for Python 3.12

* Fri Jun 23 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.2-1
- Update to 5.8.2 release

* Thu Jun 08 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.1-2
- Drop requires libsoup

* Thu Jun 08 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.1-1
- Update to 5.8.1 release

* Thu Jun 08 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.0-2
- Default disable desktop effects

* Wed Jun 07 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.0-1
- Update to 5.8.0 release

* Wed Jun 07 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.0-0.2.20230606git77e26ae
- Update to git master snapshot

* Fri Jun 02 2023 Leigh Scott <leigh123linux@gmail.com> - 5.8.0-0.1.20230601git93135ed
- Update to git master snapshot

* Tue May 09 2023 Leigh Scott <leigh123linux@gmail.com> - 5.6.8-3
- Rebuild for cjs-5.7.0

* Thu Apr 13 2023 Leigh Scott <leigh123linux@gmail.com> - 5.6.8-2
- Fix settings on aarch64

* Mon Mar 20 2023 Leigh Scott <leigh123linux@gmail.com> - 5.6.8-1
- Update to 5.6.8 release

* Thu Feb 16 2023 Leigh Scott <leigh123linux@gmail.com> - 5.6.7-1
- Update to 5.6.7 release

* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

* Thu Dec 15 2022 Leigh Scott <leigh123linux@gmail.com> - 5.6.5-1
- Update to 5.6.5 release

* Wed Nov 30 2022 Leigh Scott <leigh123linux@gmail.com> - 5.6.4-1
- Update to 5.6.4 release

* Mon Nov 28 2022 Leigh Scott <leigh123linux@gmail.com> - 5.6.3-1
- Readd lost window placement modes

* Fri Nov 18 2022 Leigh Scott <leigh123linux@gmail.com> - 5.6.1-1
- Update to 5.6.1 release

* Tue Sep 06 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.12-1
- Update to 5.4.12 release

* Sun Aug 21 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.11-1
- Update to 5.4.11 release

* Sat Aug 13 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.10-2
- Fix soup version issue for applets

* Sat Aug 13 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.10-1
- Update to 5.4.10 release

* Mon Aug 01 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.9-1
- Update to 5.4.9 release

* Mon Jul 25 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.8-1
- Update to 5.4.8 release

* Sun Jul 24 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.7-1
- Update to 5.4.7 release

* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

* Wed Jul 20 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.5-1
- Update to 5.4.5 release

* Fri Jul 15 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.4-1
- Update to 5.4.4 release

* Wed Jul 13 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.2-2.20220712git1fe1f52
- Update to latest snapshot

* Mon Jun 27 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.2-1
- Update to 5.4.2 release

* Mon Jun 20 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.1-1
- Update to 5.4.1 release

* Sat Jun 11 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.0-2
- Add requires gsound

* Sat Jun 11 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.0-1
- Update to 5.4.0 release

* Sun May 22 2022 Leigh Scott <leigh123linux@gmail.com> - 5.2.7-4
- The calendar-server sub-package isn't noarch due to search paths

* Mon May 16 2022 Leigh Scott <leigh123linux@gmail.com> - 5.2.7-3
- Fix calendar-server sub-package

* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

* Sat Jan 01 2022 Leigh Scott <leigh123linux@gmail.com> - 5.2.7-1
- Update to 5.2.7 release


Loading…
Cancel
Save