From 5a440579399769183daa33fe2444a6f2dfd9bd3e Mon Sep 17 00:00:00 2001 From: raveit65 Date: Nov 12 2022 19:43:00 +0000 Subject: update to 1.26.1 --- diff --git a/.gitignore b/.gitignore index ad7b712..95c76c0 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /marco-1.24.1.tar.xz /marco-1.24.2.tar.xz /marco-1.26.0.tar.xz +/marco-1.26.1.tar.xz diff --git a/marco.spec b/marco.spec index b0b1bbd..29f4e11 100644 --- a/marco.spec +++ b/marco.spec @@ -13,9 +13,9 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: marco -Version: %{branch}.0 +Version: %{branch}.1 %if 0%{?rel_build} -Release: 5%{?dist} +Release: 1%{?dist} %else Release: 0.17%{?git_rel}%{?dist} %endif @@ -29,17 +29,6 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} -# from 1.26 upstream branch -Patch1: marco_0001-Safeguard-against-calling-gdk_x11_window_get_xid-wit.patch -Patch2: marco_0002-fix-code-formatting-issue-of-previous-commit.patch -Patch3: marco_0003-prefs-fix-memory-leak.patch -Patch4: marco_0004-build-fix-meson-build.patch -Patch5: marco_0005-compositor-xrender-fix-memory-leak.patch -Patch6: marco_0006-theme-fix-memory-leak.patch -# https://github.com/mate-desktop/marco/commit/63b00b9 -# fixing wine -Patch7: marco_0001-window-do-not-disable-fullscreen-for-dialogs.patch - BuildRequires: desktop-file-utils BuildRequires: gtk3-devel BuildRequires: libcanberra-devel @@ -162,6 +151,9 @@ desktop-file-install \ %changelog +* Sat Nov 12 2022 Wolfgang Ulbrich - 1.26.1-1 +- update to 1.26.1 + * Sat Oct 15 2022 Wolfgang Ulbrich - 1.26.0-5 - fix dialog windows in wine - https://github.com/mate-desktop/marco/commit/63b00b9 diff --git a/sources b/sources index 6830e28..7168c67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (marco-1.26.0.tar.xz) = 013ba12dc7f4affe24bc5763ae88e44ede3f1454e74b5a642503d3741ce935f6757eba3f9def56670414c5a9c03b38384b5b54a494f9cb8f5bfd480e43300e76 +SHA512 (marco-1.26.1.tar.xz) = 241857696f5cafe3ce96b90e3302e6bcc5d5cbae2f5bb5d71e73d623fcfd2f1a7079415efb2d93d77d0a135ea96e1fd144ab2530fa87935c913b85555f217fc9