From 32457ed24381df1e4d2fd105182c05773eccfab9 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Aug 12 2020 16:33:43 +0000 Subject: update to 1.24.1 --- diff --git a/.gitignore b/.gitignore index dace251..f4e5091 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /mate-desktop-1.22.2.tar.xz /mate-desktop-1.23.3.tar.xz /mate-desktop-1.24.0.tar.xz +/mate-desktop-1.24.1.tar.xz diff --git a/mate-desktop.spec b/mate-desktop.spec index c1f54c8..2edab87 100644 --- a/mate-desktop.spec +++ b/mate-desktop.spec @@ -15,9 +15,9 @@ Summary: Shared code for mate-panel, mate-session, mate-file-manager, etc Name: mate-desktop License: GPLv2+ and LGPLv2+ and MIT -Version: %{branch}.0 +Version: %{branch}.1 %if 0%{?rel_build} -Release: 5%{?dist} +Release: 1%{?dist} %else Release: 0.11%{?git_rel}%{?dist} %endif @@ -30,14 +30,10 @@ URL: http://mate-desktop.org %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} # fedora specific settings -Source1: mate-fedora-f30.gschema.override -Source2: mate-fedora-f31.gschema.override -Source3: mate-fedora-f32.gschema.override -Source4: mate-rhel.gschema.override -Source5: mate-mimeapps.list - -# https://github.com/mate-desktop/mate-desktop/pull/437 -Patch1: mate-desktop_0001-mate-about.desktop-Do-not-collect-the-translation-fo.patch +Source1: mate-fedora-f31.gschema.override +Source2: mate-fedora-f32.gschema.override +Source3: mate-rhel.gschema.override +Source4: mate-mimeapps.list BuildRequires: dconf-devel BuildRequires: desktop-file-utils @@ -62,9 +58,6 @@ Requires: f32-backgrounds-mate %if 0%{?fedora} && 0%{?fedora} == 31 Requires: f31-backgrounds-mate %endif -%if 0%{?fedora} && 0%{?fedora} == 30 -Requires: f30-backgrounds-mate -%endif %if 0%{?fedora} # Need this to pull in the right imsettings in groupinstalls @@ -110,9 +103,6 @@ libmatedesktop. NOCONFIGURE=1 ./autogen.sh %endif -# patch1 -NOCONFIGURE=1 ./autogen.sh - %build %configure \ --enable-gtk-doc \ @@ -142,24 +132,20 @@ desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/mate-color-select.desktop -%if 0%{?fedora} == 30 -install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/10_mate-fedora.gschema.override -%endif - %if 0%{?fedora} == 31 -install -D -m 0644 %SOURCE2 %{buildroot}%{_datadir}/glib-2.0/schemas/10_mate-fedora.gschema.override +install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/10_mate-fedora.gschema.override %endif %if 0%{?fedora} >= 32 -install -D -m 0644 %SOURCE3 %{buildroot}%{_datadir}/glib-2.0/schemas/10_mate-fedora.gschema.override +install -D -m 0644 %SOURCE2 %{buildroot}%{_datadir}/glib-2.0/schemas/10_mate-fedora.gschema.override %endif %if 0%{?rhel} -install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/glib-2.0/schemas/10_mate-rhel.gschema.override +install -D -m 0644 %SOURCE3 %{buildroot}%{_datadir}/glib-2.0/schemas/10_mate-rhel.gschema.override %endif mkdir -p %{buildroot}%{_datadir}/applications -install -m 644 %SOURCE5 %{buildroot}/%{_datadir}/applications/mate-mimeapps.list +install -m 644 %SOURCE4 %{buildroot}/%{_datadir}/applications/mate-mimeapps.list %find_lang %{name} --with-gnome --all-name @@ -197,6 +183,9 @@ install -m 644 %SOURCE5 %{buildroot}/%{_datadir}/applications/mate-mimeapps.list %changelog +* Wed Aug 12 2020 Wolfgang Ulbrich - 1.24.1-1 +- update to 1.24.1 + * Sun Aug 09 2020 Wolfgang Ulbrich - 1.24.0-5 - Deactivate previews in the window-list-applet with a gsettings override diff --git a/mate-desktop_0001-mate-about.desktop-Do-not-collect-the-translation-fo.patch b/mate-desktop_0001-mate-about.desktop-Do-not-collect-the-translation-fo.patch deleted file mode 100644 index 40c3d75..0000000 --- a/mate-desktop_0001-mate-about.desktop-Do-not-collect-the-translation-fo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6ea12ac338ce76ec46f7b4046be0fb627263e094 Mon Sep 17 00:00:00 2001 -From: rbuj -Date: Mon, 2 Mar 2020 11:20:58 +0100 -Subject: [PATCH] mate-about.desktop: Do not collect the translation for Icon - ---- - mate-about/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mate-about/Makefile.am b/mate-about/Makefile.am -index 67a4293..e557bbe 100644 ---- a/mate-about/Makefile.am -+++ b/mate-about/Makefile.am -@@ -13,7 +13,7 @@ desktopdir = $(datadir)/applications - desktop_in_files = mate-about.desktop.in - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - mate-about.desktop: mate-about.desktop.in -- $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ -+ $(AM_V_GEN)$(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --template $< -d $(top_srcdir)/po -o $@ - - versiondir = $(datadir)/mate-about - version_DATA = mate-version.xml --- -2.21.1 - diff --git a/mate-fedora-f30.gschema.override b/mate-fedora-f30.gschema.override deleted file mode 100644 index 09a50d9..0000000 --- a/mate-fedora-f30.gschema.override +++ /dev/null @@ -1,40 +0,0 @@ -[org.mate.background] -picture-filename='/usr/share/backgrounds/f30/default/f30.xml' - -[org.mate.panel.menubar] -icon-name='fedora-logo-icon' - -[org.mate.panel] -default-layout='fedora' - -[org.mate.interface] -gtk-theme='BlueMenta' -icon-theme='mate' - -[org.mate.mate-menu] -applet-icon='/usr/share/icons/hicolor/22x22/apps/fedora-logo-icon.png' - -[org.mate.peripherals-mouse] -cursor-theme='mate' - -[org.mate.Marco.general] -allow-top-tiling=false -center-new-windows=false -theme='BlueMenta' - -[org.mate.caja.preferences] -enable-delete=true - -[org.mate.terminal.profile] -title-mode='ignore' -title='Mate Terminal' - -[org.mate.session] -required-components-list=['windowmanager', 'panel', 'filemanager'] - -[org.mate.drivemount] -drivemount-checkmark-color='#6699CC' - -[org.gnome.software] -compatible-projects=['GNOME', 'KDE', 'XFCE', 'MATE'] - diff --git a/mate-fedora-f31.gschema.override b/mate-fedora-f31.gschema.override index 1e155dd..dae0081 100644 --- a/mate-fedora-f31.gschema.override +++ b/mate-fedora-f31.gschema.override @@ -35,6 +35,9 @@ required-components-list=['windowmanager', 'panel', 'filemanager'] [org.mate.drivemount] drivemount-checkmark-color='#6699CC' +[org.mate.panel.applet.window-list-previews] +show-window-thumbnails=false + [org.gnome.software] compatible-projects=['GNOME', 'KDE', 'XFCE', 'MATE'] diff --git a/sources b/sources index dc474f4..e55e222 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mate-desktop-1.24.0.tar.xz) = ca60325e7f6167efd21bdd32ae40c2f2bf5ae9bef85f0a43afec05d50567fb650fc0426d94c510b3a42c625dc4b2d31d7559befa50cfbb6d9878635558a52323 +SHA512 (mate-desktop-1.24.1.tar.xz) = 0691dd613946d5d67596d98cd489536f5876cb97fb4c5290133b198479b4bfa3835ca52a16a2d0cc5e863d625aedda83ab01e85d67f58a09763673f0f18ebc5a