From cab07f3222b74138cc1368554526a42fe5d8fbf1 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Oct 26 2015 15:51:42 +0000 Subject: update to 1.10.3 release --- diff --git a/.gitignore b/.gitignore index c145208..7bece04 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /marco-1.8.3.tar.xz /marco-1.10.1.tar.xz /marco-1.10.2.tar.xz +/marco-1.10.3.tar.xz diff --git a/marco.spec b/marco.spec index 7f3a82c..ac5d77c 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}.2 +Version: %{branch}.3 %if 0%{?rel_build} -Release: 2%{?dist} +Release: 1%{?dist} %else Release: 0.1%{?git_rel}%{?dist} %endif @@ -38,11 +38,6 @@ Source5: window.png # needed for fixing initial-setup issue, rhbz (#962009) Patch0: marco_add-pixbuf-inline-icons_1.9.x.patch -# https://github.com/mate-desktop/marco/pull/229 -# https://bugzilla.redhat.com/show_bug.cgi?id=1258638 -Patch1: marco_effects-remove-hack.patch -# fix https://bugzilla.redhat.com/show_bug.cgi?id=1258131 -Patch2: marco_revert-GTK_FRAME_EXTENTS-commits.patch Requires: mate-desktop-libs @@ -98,8 +93,6 @@ cp %{SOURCE4} src/stock_minimize.png cp %{SOURCE5} src/window.png %patch0 -p1 -b .inline-icons -%patch1 -p1 -b .remove-hack -%patch2 -p1 -b .revert-GTK_FRAME_EXTENTS # needed for the patch and for git snapshot builds autoreconf -if @@ -179,6 +172,10 @@ fi %changelog +* Mon Oct 26 2015 Wolfgang Ulbrich - 1.10.3-1 +- update to 1.10.3 release +- remove upstreamed patch + * Fri Oct 23 2015 Wolfgang Ulbrich - 1.10.2-2 - fix rhbz (#1258638) - fix rhbz (#1258131), revert support for GTK_FRAME_EXTENTS for the moment diff --git a/sources b/sources index 3dab1cf..dbb3402 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be68a8efe9f5ca3b1b54388836bdd8ce marco-1.10.2.tar.xz +da0c0c683d8be8e19d827e56ab092665 marco-1.10.3.tar.xz