From 680ba61bba47fd889a29614296896d6d4d804d8a Mon Sep 17 00:00:00 2001
From: Dominic Hopf <dmaphy@fedoraproject.org>
Date: Nov 06 2014 19:24:30 +0000
Subject: Update to 3.12.1


- Fix SVN breaking on non-root directories.
- Fix GtkSource view parameters not being honored.

---

diff --git a/.gitignore b/.gitignore
index 47f2ade..fc4526b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /meld-3.11.3.tar.xz
 /meld-3.11.4.tar.xz
 /meld-3.12.0.tar.xz
+/meld-3.12.1.tar.xz
diff --git a/meld-3.12-gtksrcview-fix.patch b/meld-3.12-gtksrcview-fix.patch
new file mode 100644
index 0000000..a598a7e
--- /dev/null
+++ b/meld-3.12-gtksrcview-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/meld/sourceview.py b/meld/sourceview.py
+index 48aa9a2..a0c9e4f 100644
+--- a/meld/sourceview.py
++++ b/meld/sourceview.py
+@@ -49,7 +49,7 @@ class MeldSourceView(GtkSource.View):
+     __gtype_name__ = "MeldSourceView"
+ 
+     __gsettings_bindings__ = (
+-        ('indent-width', 'indent-width'),
++        ('indent-width', 'tab-width'),
+         ('insert-spaces-instead-of-tabs', 'insert-spaces-instead-of-tabs'),
+         ('show-line-numbers', 'show-line-numbers'),
+         ('draw-spaces', 'draw-spaces'),
diff --git a/meld-3.12-svn-fix.patch b/meld-3.12-svn-fix.patch
new file mode 100644
index 0000000..e5f8601
--- /dev/null
+++ b/meld-3.12-svn-fix.patch
@@ -0,0 +1,20 @@
+diff --git a/meld/vc/svn.py b/meld/vc/svn.py
+index c89372a..0ffbeb8 100644
+--- a/meld/vc/svn.py
++++ b/meld/vc/svn.py
+@@ -161,10 +161,12 @@ class Vc(_vc.CachedVc):
+         if _vc.call([cls.CMD, "info"], cwd=path):
+             return False
+ 
++        root, location = cls.is_in_repo(path)
++
+         # Check for repository version, trusting format file then entries file
+-        format_path = os.path.join(path, cls.VC_DIR, "format")
+-        entries_path = os.path.join(path, cls.VC_DIR, "entries")
+-        wcdb_path = os.path.join(path, cls.VC_DIR, "wc.db")
++        format_path = os.path.join(root, cls.VC_DIR, "format")
++        entries_path = os.path.join(root, cls.VC_DIR, "entries")
++        wcdb_path = os.path.join(root, cls.VC_DIR, "wc.db")
+         format_exists = os.path.exists(format_path)
+         entries_exists = os.path.exists(entries_path)
+         wcdb_exists = os.path.exists(wcdb_path)
diff --git a/meld.spec b/meld.spec
index 5228834..888a203 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,5 +1,5 @@
 Name:		meld
-Version:	3.12.0
+Version:	3.12.1
 Release:	1%{?dist}
 Summary:	Visual diff and merge tool
 
@@ -8,6 +8,9 @@ License:	GPLv2+
 URL:		http://meldmerge.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.12/%{name}-%{version}.tar.xz
 
+Patch0:		meld-3.12-svn-fix.patch
+Patch1:		meld-3.12-gtksrcview-fix.patch
+
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	intltool
@@ -41,7 +44,8 @@ allows merges. The margins show location of changes for easy navigation.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .meld-3.12-svn-fix
+%patch1 -p1 -b .meld-3.12-gtksrcview-fix
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -104,6 +108,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Nov 06 2014 Dominic Hopf <dmaphy@fedoraproject.org> - 3.12.1-1
+- Update to 3.12.1
+- Fix SVN breaking on non-root directories.
+- Fix GtkSource view parameters not being honored.
+
 * Sat Oct 04 2014 Dominic Hopf <dmaphy@fedoraproject.org> - 3.12.0-1
 - Update to 3.12.0
 
diff --git a/sources b/sources
index ac1ea36..cb8fe18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9dbdb3306dc5d2415baeae3892bcec8e  meld-3.12.0.tar.xz
+e5d68878e17ab9dc3c73c0d8ddbc0a9f  meld-3.12.1.tar.xz