From 7c6206d3e3a4f32c90156780d5dbe53021c8f059 Mon Sep 17 00:00:00 2001
From: Wolfgang Ulbrich <chat-to-me(a)raveit.de>
Date: Tue, 1 Dec 2015 01:17:28 +0100
Subject: update to 1.12.1 release
---
.gitignore | 1 +
mate-desktop.spec | 13 ++++++-------
sources | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index 52c25af..9e6a6bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
/mate-desktop-1.10.2.tar.xz
/mate-desktop-1.11.0.tar.xz
/mate-desktop-1.12.0.tar.xz
+/mate-desktop-1.12.1.tar.xz
diff --git a/mate-desktop.spec b/mate-desktop.spec
index 3bd29b4..65a8156 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: 2%{?dist}
+Release: 1%{?dist}
%else
Release: 0.1%{?git_rel}%{?dist}
%endif
@@ -29,9 +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#/%{...
-#
https://github.com/mate-desktop/mate-desktop/commit/06ccb7a
-Patch1: mate-desktop_display-properties-do-not-free-string-literal.patch
-
Source1: mate-fedora-f23.gschema.override
Source2: mate-mimeapps.list
@@ -114,8 +111,6 @@ libmatedesktop.
%prep
%setup -q%{!?rel_build:n %{name}-%{commit}}
-%patch1 -p1 -b .display-properties
-
%if 0%{?rel_build}
# for releases
#NOCONFIGURE=1 ./autogen.sh
@@ -223,6 +218,10 @@ fi
%changelog
+* Tue Dec 01 2015 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.12.1-11
+- update to 1.12.1 release
+- removed uptreamed patch
+
* Fri Nov 06 2015 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.12.0-2
- fix crash with display-properties
diff --git a/sources b/sources
index deb7bd7..462608a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b7ed68fb5017b40a001e020349be514 mate-desktop-1.12.0.tar.xz
+f5e1fb4f0b59b3d09b00a90cb07bc281 mate-desktop-1.12.1.tar.xz
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/mate-desktop.git/commit/?h=master&...