[mate-text-editor/f20] fix merge conflicts in spec file

[Wolfgang Ulbrich]

commit 60e8a7301ad278ab7ccf00876a7d83f9528b61c1
Author: raveit65 <chat-to-me at raveit.de>
Date:   Wed Jan 1 16:25:09 2014 +0100

    fix merge conflicts in spec file

 mate-text-editor.spec |   35 +++++++----------------------------
 1 files changed, 7 insertions(+), 28 deletions(-)
---
diff --git a/mate-text-editor.spec b/mate-text-editor.spec
index 6260f60..0aaecf4 100644
--- a/mate-text-editor.spec
+++ b/mate-text-editor.spec
@@ -1,19 +1,11 @@
 Summary:  Text editor for the MATE desktop
 Name:     mate-text-editor
-<<<<<<< HEAD
 Version:  1.6.1
-=======
-Version:  1.7.0
->>>>>>> master
 Release:  1%{?dist}
 License:  GPLv2+
 Group:    Applications/Editors
 URL:      http://mate-desktop.org
-
-#Use old tarball name for testing temporarily
-Source0:   http://vicodan.fedorapeople.org/%{name}-%{version}.tar.gz
-
-#Source0:  http://pub.mate-desktop.org/releases/1.7/%{name}-%{version}.tar.xz
+Source0:  http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 
 
 BuildRequires: desktop-file-utils
@@ -64,10 +56,7 @@ Development files for mate-text-editor
 
 %prep
 %setup -q
-<<<<<<< HEAD
 #NOCONFIGURE=1 ./autogen.sh
-=======
->>>>>>> master
 
 # Fix debug permissions with messy hack 
 find ./*/* -type f -exec chmod 644 {} \;
@@ -76,13 +65,11 @@ find ./*/*/* -type f -exec chmod 644 {} \;
 
 %build
 %configure \
-        --disable-static           \
-        --disable-scrollkeeper     \
-        --enable-gtk-doc-html      \
-        --enable-gvfs-metadata     \
-        --enable-python            \
-        --enable-gtk-doc-html      \
-        --with-gtk=2.0             \
+        --disable-static          \
+        --disable-scrollkeeper    \
+        --enable-gtk-doc-html     \
+        --enable-gvfs-metadata    \
+        --enable-python           \
         --disable-schemas-compile
 
 make %{?_smp_mflags} V=1
@@ -126,12 +113,9 @@ fi
 %files  -f pluma.lang
 %doc README COPYING AUTHORS
 %{_datadir}/pluma
-%{_datadir}/help/*/pluma
+%{_datadir}/mate/help/pluma
 %{_datadir}/applications/pluma.desktop
-<<<<<<< HEAD
 %{_datadir}/omf/pluma
-=======
->>>>>>> master
 %{_datadir}/gtk-doc/html/pluma
 %{_mandir}/man1/*
 %{_libdir}/pluma
@@ -148,13 +132,8 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
 * Wed Jan 1 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-1
 - update to 1.6.1 release
-=======
-* Fri Dec 06 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.0-1
-- Update to 1.7.0
->>>>>>> master
 
 * Thu Aug 08 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-5
 - add runtime require mate-file-manager-schemas to fix #959607