[gedit] Update to 3.1.1 New gedit-zeitgeist subpackage

[Tomas Bzatek]

commit 427dedcb7819eda42cde5c778e7a2cea54b60042
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Thu Jun 16 14:00:18 2011 +0200

    Update to 3.1.1
    New gedit-zeitgeist subpackage

 .gitignore                                         |    1 +
 ...-use-after-free-during-incremental-search.patch |   38 -----------
 gedit.spec                                         |   66 ++++++++++++++++----
 sources                                            |    2 +-
 4 files changed, 56 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e81050..629eb38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ gedit-2.31.6.tar.bz2
 /gedit-3.0.0.tar.bz2
 /gedit-3.0.1.tar.bz2
 /gedit-3.0.2.tar.bz2
+/gedit-3.1.1.tar.xz
diff --git a/gedit.spec b/gedit.spec
index 49101aa..4e78e57 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,4 +1,4 @@
-%define glib2_version 2.25.15
+%define glib2_version 2.28.0
 %define pygo_version 2.27
 %define desktop_file_utils_version 0.9
 %define gtksourceview_version 3.0.0
@@ -6,24 +6,23 @@
 %define enchant_version 1.2.0
 %define isocodes_version 0.35
 %define libpeas_version 0.7.3
+%define zeitgeist_version 0.3.2
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
 Epoch:		2
-Version: 	3.0.2
-Release:        2%{?dist}
+Version:	3.1.1
+Release:	1%{?dist}
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
 #VCS: git:git://git.gnome.org/gedit
-Source0:	http://download.gnome.org/sources/gedit/3.0/gedit-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/gedit/3.1/gedit-%{version}.tar.xz
 
 URL:		http://projects.gnome.org/gedit/
 
 Requires(post):         desktop-file-utils >= %{desktop_file_utils_version}
 Requires(postun):       desktop-file-utils >= %{desktop_file_utils_version}
 
-Patch0: 0001-Fix-use-after-free-during-incremental-search.patch
-
 %ifarch ppc64,x86_64,ia64,s390x
 Patch1: gedit-2.13.90-libdir.patch
 %endif
@@ -56,6 +55,7 @@ Requires: pygobject2 >= %{pygo_version}
 # the run-command plugin uses zenity
 Requires: zenity
 Requires: gsettings-desktop-schemas
+Requires: gvfs
 
 %description
 gedit is a small, but powerful text editor designed specifically for
@@ -83,11 +83,20 @@ to gedit.
 
 Install gedit-devel if you want to write plugins for gedit.
 
+%package zeitgeist
+Summary: Zeitgeist plugin for gedit
+Group: Applications/Editors
+Requires: %{name} = %{version}-%{release}
+BuildRequires: libzeitgeist-devel >= %{zeitgeist_version}
+
+%description zeitgeist
+This packages brings the Zeitgeist dataprovider - a plugin that logs
+access and leave event for documents used with gedit.
+
+
 %prep
 %setup -n gedit-%{version} -q
 
-%patch0 -p1 -b .search-double-free
-
 %ifarch ppc64,x86_64,ia64,s390x
 %patch1 -p1 -b .libdir
 %endif
@@ -103,7 +112,8 @@ intltoolize -f
 	--disable-gtk-doc \
 	--enable-introspection=yes \
 	--enable-python=yes \
-	--disable-updater
+	--disable-updater \
+	--enable-gvfs-metadata
 make %{_smp_mflags}
 
 %install
@@ -138,15 +148,38 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc README COPYING AUTHORS
 %{_datadir}/gedit
 %{_datadir}/applications/gedit.desktop
 %{_mandir}/man1/*
-%{_libdir}/gedit
 %{_libdir}/libgedit-private.so.*
 %{_libdir}/python2.7/site-packages/gi/overrides/Gedit.py*
 %{_libexecdir}/gedit
+%{_libdir}/gedit/girepository-1.0
+%dir %{_libdir}/gedit/plugins
+%{_libdir}/gedit/plugins/changecase.plugin
+%{_libdir}/gedit/plugins/libchangecase.so
+%{_libdir}/gedit/plugins/docinfo.plugin
+%{_libdir}/gedit/plugins/libdocinfo.so
+%{_libdir}/gedit/plugins/externaltools.plugin
+%{_libdir}/gedit/plugins/externaltools
+%{_libdir}/gedit/plugins/filebrowser.plugin
+%{_libdir}/gedit/plugins/libfilebrowser.so
+%{_libdir}/gedit/plugins/modelines.plugin
+%{_libdir}/gedit/plugins/libmodelines.so
+%{_libdir}/gedit/plugins/pythonconsole.plugin
+%{_libdir}/gedit/plugins/pythonconsole
+%{_libdir}/gedit/plugins/quickopen.plugin
+%{_libdir}/gedit/plugins/quickopen
+%{_libdir}/gedit/plugins/snippets.plugin
+%{_libdir}/gedit/plugins/snippets
+%{_libdir}/gedit/plugins/sort.plugin
+%{_libdir}/gedit/plugins/libsort.so
+%{_libdir}/gedit/plugins/spell.plugin
+%{_libdir}/gedit/plugins/libspell.so
+%{_libdir}/gedit/plugins/time.plugin
+%{_libdir}/gedit/plugins/libtime.so
 %{_bindir}/*
 %{_datadir}/GConf/gsettings
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
@@ -161,14 +194,23 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %{_includedir}/gedit-3.0
 
 %{_libdir}/libgedit-private.so
 %{_libdir}/pkgconfig/gedit.pc
 %{_datadir}/gtk-doc
 
+%files zeitgeist
+%defattr(-, root, root, -)
+%{_libdir}/gedit/plugins/zeitgeist.plugin
+%{_libdir}/gedit/plugins/libzeitgeistplugin.so
+
 %changelog
+* Thu Jun 16 2011 Tomas Bzatek <tbzatek at redhat.com> - 3.1.1-1
+- Update to 3.1.1
+- New gedit-zeitgeist subpackage
+
 * Wed May 25 2011 Dan Williams <dcbw at redhat.com> 2:3.0.2-2
 - Fix double-free when searching
 
diff --git a/sources b/sources
index 04f1d09..a2a8b6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec8dc39195ec767ab10397d7302ee0b2  gedit-3.0.2.tar.bz2
+799ba4a58da59b664a162bb934f5cd91  gedit-3.1.1.tar.xz