- updated to 2.18.0; merged changes from DEVEL

Changed files:
    gedit.spec -> 1.110

diff --git a/gedit.spec b/gedit.spec
index cf72a7d05d07a0fd08ef8359a54b8ff76379d640..7fc7df8f683a3a12b8a9b8bd98068568f6a6d89c 100644 (file)
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,44 +1,45 @@
 Summary:       gedit - small but powerful text editor for X Window
 Summary(pl.UTF-8):     gedit - mały ale potężny edytor tekstu dla X Window
 Name:          gedit2
-Version:       2.16.2
+Version:       2.18.0
 Release:       1
 License:       GPL v2
 Group:         X11/Applications/Editors
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gedit/2.16/gedit-%{version}.tar.bz2
-# Source0-md5: 9ed4fb2891d07c022b487723d1c72161
-Patch0:                %{name}-use_default_font.patch
-Patch1:                %{name}-desktop.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gedit/2.18/gedit-%{version}.tar.bz2
+# Source0-md5: faf35c2a934aff2a37a58f56c9f11e15
 URL:           http://gedit.sourceforge.net/
-BuildRequires: GConf2-devel >= 2.16.0
-BuildRequires: ORBit2-devel >= 1:2.14.3
-BuildRequires: aspell-devel
-BuildRequires: autoconf >= 2.52
+BuildRequires: GConf2-devel >= 2.18.0.1
+BuildRequires: ORBit2-devel >= 1:2.14.7
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-BuildRequires: eel-devel >= 2.16.0
+BuildRequires: enchant-devel >= 1.2.0
 BuildRequires: gettext-devel
 BuildRequires: gnome-common >= 2.12.0
-BuildRequires: gnome-doc-utils >= 0.8.0
-BuildRequires: gnome-menus-devel >= 2.16.0
-BuildRequires: gtk-doc >= 1.7
-BuildRequires: gtksourceview-devel >= 1.8.1
-BuildRequires: intltool >= 0.35
+BuildRequires: gnome-doc-utils >= 0.9.2
+BuildRequires: gnome-menus-devel >= 2.17.92
+BuildRequires: gnome-vfs2-devel >= 2.17.91
+BuildRequires: gtk-doc >= 1.8
+BuildRequires: gtk+2-devel >= 2:2.10.9
+BuildRequires: gtksourceview-devel >= 1.8.4
+BuildRequires: intltool >= 0.35.5
+BuildRequires: iso-codes
 BuildRequires: libglade2-devel >= 1:2.6.0
-BuildRequires: libgnomeprintui-devel >= 2.12.1
-BuildRequires: libgnomeui-devel >= 2.16.0
+BuildRequires: libgnomeprintui-devel >= 2.17.92
+BuildRequires: libgnomeui-devel >= 2.17.92
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: python-gnome-desktop-devel >= 2.16.0
+BuildRequires: python-devel >= 2.3
+BuildRequires: python-gnome-desktop-devel >= 2.17.93
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper >= 0.3.12
-Requires(post,preun):  GConf2 >= 2.16.0
+Requires(post,preun):  GConf2
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): scrollkeeper
-Requires:      libgnomeprintui >= 2.12.1
-Requires:      libgnomeui >= 2.16.0
-Requires:      python-gnome-desktop-gtksourceview >= 2.16.0
-Requires:      gnome-vfs2 >= 2.16.1
+Requires:      libgnomeprintui >= 2.17.92
+Requires:      libgnomeui >= 2.17.92
+Requires:      python-gnome-desktop-gtksourceview >= 2.17.93
+Requires:      gnome-vfs2 >= 2.17.91
 Obsoletes:     gedit-devel
 Obsoletes:     gedit-plugins < 2.3.3-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,14 +59,13 @@ dokumentów naraz i wiele innych.
 
 %package devel
 Summary:       gedit header files
-Summary(pl.UTF-8):     pliki nagłówkowe gedit
+Summary(pl.UTF-8):     Pliki nagłówkowe gedit
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      eel-devel >= 2.16.0
-Requires:      gtksourceview-devel >= 1.8.1
+Requires:      gtksourceview-devel >= 1.8.4
 Requires:      libglade2-devel >= 1:2.6.0
-Requires:      libgnomeprintui-devel >= 2.12.1
-Requires:      libgnomeui-devel >= 2.16.0
+Requires:      libgnomeprintui-devel >= 2.17.92
+Requires:      libgnomeui-devel >= 2.17.92
 
 %description devel
 gedit header files
@@ -75,8 +75,6 @@ Pliki nagłówkowe gedit.
 
 %prep
 %setup -q -n gedit-%{version}
-%patch0 -p1
-%patch1 -p1
 sed -i 's/codegen.py/codegen.pyc/' configure.ac
 
 %build
@@ -130,7 +128,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f gedit.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog TODO AUTHORS
+%doc README ChangeLog AUTHORS
 %{_sysconfdir}/gconf/schemas/gedit.schemas
 %{_sysconfdir}/gconf/schemas/gedit-file-browser.schemas
 %attr(755,root,root) %{_bindir}/*
@@ -139,11 +137,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/gedit-2/plugins/externaltools
 %dir %{_libdir}/gedit-2/plugins/pythonconsole
 %dir %{_libdir}/gedit-2/plugins/snippets
+%attr(755,root,root) %{_libdir}/gedit-2/gedit-bugreport.sh
 %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/pythonconsole/*.py[co]
 %{_libdir}/gedit-2/plugins/snippets/*.glade
 %{_libdir}/gedit-2/plugins/snippets/*.py[co]