Merge branch 'f15'

Conflicts:
	gedit-plugins.spec

gedit-plugins.spec

@@ -1,6 +1,6 @@
 Name:           gedit-plugins
 Version:        3.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
@@ -9,26 +9,17 @@ URL:            http://live.gnome.org/GeditPlugins
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/%{name}-%{version}.tar.bz2
 
 BuildRequires:  gedit-devel
-BuildRequires:  gucharmap-devel
 BuildRequires:  gnome-doc-utils
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  gettext
-BuildRequires:  vte3-devel
 BuildRequires:  cairo-devel
 BuildRequires:  atk-devel
-BuildRequires:  pygtk2-devel
-BuildRequires:  pygtksourceview-devel
 BuildRequires:  pygobject2-devel
 BuildRequires:  intltool
 BuildRequires:  libpeas-devel
 BuildRequires:  dbus-python-devel
 Requires:       gedit
-Requires:       pygtk2
-Requires:       pygtksourceview
 Requires:       pygobject2
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
 # these are needed for gobject-introspection
 Requires:       vte3 >= 0.27.90-2.fc15
 Requires:       gucharmap >= 2.33.2-6.fc15
@@ -39,8 +30,6 @@ A collection of plugins for gedit.
 
 %prep
 %setup -q
-grep '"import vte' configure && sed \
-    -i "s!import vte!import imp; imp.find_module('vte')!" configure
 
 %build
 %configure --disable-schemas-install --enable-python
@@ -79,6 +68,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 
 
 %changelog
+* Wed May 18 2011 Ignacio Casal Quinteiro <icq@gnome.org> - 3.0.2-2
+- Remove useless deps
+
 * Tue Apr 26 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.2-1
 - Update to 3.0.2