- merged from DEVEL

Changed files:
    gedit.spec -> 1.86
    gedit2-desktop.patch -> 1.3

diff --git a/gedit.spec b/gedit.spec
index a9dd74ddea49927583316e53c5c24984e0dd2426..1ab1ecbf0097e16ade5ead3765b72740793b0112 100644 (file)
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,12 +1,12 @@
 Summary:       gEdit - small but powerful text editor for X Window
 Summary(pl):   gEdit - ma³y ale potê¿ny edytor tekstu dla X Window
 Name:          gedit2
-Version:       2.12.1
+Version:       2.14.1
 Release:       1
 License:       GPL v2
 Group:         X11/Applications/Editors
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gedit/2.12/gedit-%{version}.tar.bz2
-# Source0-md5: 13f376c6c63b0fbd25ba9b6c7d6fb97c
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gedit/2.14/gedit-%{version}.tar.bz2
+# Source0-md5: b51974a4bcaad0b14644c9f5a22f13f2
 Patch0:                %{name}-use_default_font.patch
 Patch1:                %{name}-desktop.patch
 URL:           http://gedit.sourceforge.net/
@@ -18,6 +18,7 @@ BuildRequires:        automake
 BuildRequires: eel-devel >= 2.10.0
 BuildRequires: gettext-devel
 BuildRequires: gnome-common >= 2.8.0-2
+BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: gnome-menus-devel >= 2.12.0
 BuildRequires: gtksourceview-devel >= 1.3.91
 BuildRequires: intltool >= 0.33
@@ -27,15 +28,15 @@ BuildRequires:      libgnomeui-devel >= 2.11.2-2
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: popt-devel >= 1.5
+BuildRequires: python-gnome-desktop-devel >= 2.12.0
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper >= 0.3.12
-BuildRequires: xft-devel >= 2.1.2
-Requires(post,postun): /sbin/ldconfig
 Requires(post,preun):  GConf2
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): scrollkeeper
 Requires:      libgnomeprintui >= 2.10.2
+#Suggests:     python-gnome-desktop-gtksourceview >= 2.13.3
 Obsoletes:     gedit-devel
 Obsoletes:     gedit-plugins < 2.3.3-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -74,16 +75,20 @@ Pliki nag
 %setup -q -n gedit-%{version}
 %patch0 -p1
 %patch1 -p1
+sed -i 's/codegen.py/codegen.pyc/' configure.ac
 
 %build
 %{__gnome_doc_common}
 %{__libtoolize}
 %{__intltoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
-       --disable-schemas-install
+       --disable-schemas-install \
+       --disable-scrollkeeper \
+       --enable-python \
+       --with-omf-dir=%{_omf_dest_dir}/%{name}
 %{__make}
 
 %install
@@ -91,15 +96,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       omf_dest_dir=%{_omf_dest_dir}/%{name} \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 # Remove obsoleted *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.la
-
-rm -r $RPM_BUILD_ROOT%{_datadir}/{application-registry,mime-info}
-
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.py
+rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/{externaltools,snippets}/*.py
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -122,19 +125,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog TODO AUTHORS THANKS
+%doc README ChangeLog TODO AUTHORS
 %{_sysconfdir}/gconf/schemas/gedit.schemas
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/gedit-2
 %dir %{_libdir}/gedit-2/plugins
-%attr(755,root,root) %{_libdir}/gedit-2/plugins/*.so*
-%{_libdir}/bonobo/servers/*
+%dir %{_libdir}/gedit-2/plugins/externaltools
+%dir %{_libdir}/gedit-2/plugins/snippets
+%attr(755,root,root) %{_libdir}/gedit-2/plugins/*.so
+%{_libdir}/gedit-2/plugins/externaltools/*.glade
+%{_libdir}/gedit-2/plugins/externaltools/*.py[co]
 %{_libdir}/gedit-2/plugins/*.gedit-plugin
+%{_libdir}/gedit-2/plugins/*.py[co]
+%{_libdir}/gedit-2/plugins/snippets/*.glade
+%{_libdir}/gedit-2/plugins/snippets/*.py[co]
 %{_datadir}/gedit-2
-%{_datadir}/idl/*
 %{_desktopdir}/*
 %{_mandir}/man1/*
 %{_omf_dest_dir}/%{name}
+%{_omf_dest_dir}/gedit
 %{_pixmapsdir}/*
 
 %files devel

diff --git a/gedit2-desktop.patch b/gedit2-desktop.patch
index 58be2ff7c651c3d13d7d98b0ed1332a3bf42d72d..6416e264e3e2cccf4ee7d635e29baa190919d975 100644 (file)
--- a/gedit2-desktop.patch
+++ b/gedit2-desktop.patch
@@ -1,11 +1,11 @@
-diff -urN gedit-2.9.7.orig/data/gedit.desktop.in gedit-2.9.7/data/gedit.desktop.in
---- gedit-2.9.7.orig/data/gedit.desktop.in     2005-03-01 13:37:50.346344976 +0100
-+++ gedit-2.9.7/data/gedit.desktop.in  2005-03-01 13:38:28.449552408 +0100
+diff -aurN gedit-2.13.90.orig/data/gedit.desktop.in.in gedit-2.13.90/data/gedit.desktop.in.in
+--- gedit-2.13.90.orig/data/gedit.desktop.in.in        2006-01-21 18:57:01.000000000 +0100
++++ gedit-2.13.90/data/gedit.desktop.in.in     2006-01-31 17:26:49.070754000 +0100
 @@ -8,7 +8,7 @@
  StartupNotify=true
  MimeType=text/plain;
  Icon=text-editor
--Categories=Application;Utility;TextEditor;
+-Categories=GNOME;GTK;Application;Utility;TextEditor;
 +Categories=GTK;GNOME;Utility;TextEditor;
  X-GNOME-DocPath=gedit/gedit.xml
  X-GNOME-Bugzilla-Bugzilla=GNOME