diff --git a/.cvsignore b/.cvsignore index cf7f590..ddb8380 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gedit-2.0.2.tar.bz2 +gedit-2.2.0.tar.bz2 diff --git a/gedit.spec b/gedit.spec index 471a421..1dbefb9 100644 --- a/gedit.spec +++ b/gedit.spec @@ -1,18 +1,18 @@ -%define glib2_version 2.0.3 -%define pango_version 1.0.99 -%define gtk2_version 2.0.5 -%define libgnomeui_version 2.0.0 -%define libgnomeprint_version 1.115.0 -%define libgnomeprintui_version 1.115.0 -%define desktop_file_utils_version 0.2.90 -%define gail_version 0.17-2 +%define glib2_version 2.1.4 +%define pango_version 1.1.5 +%define gtk2_version 2.1.4 +%define libgnomeui_version 2.1.2 +%define libgnomeprint_version 2.2.0 +%define libgnomeprintui_version 2.2.0 +%define desktop_file_utils_version 0.3 +%define gail_version 0.17-3 %define po_package gedit-2.0 Summary: gEdit is a small but powerful text editor for GNOME. Name: gedit -Version: 2.0.2 -Release: 5 +Version: 2.2.0 +Release: 1 Epoch: 1 License: GPL Group: Applications/Editors @@ -27,14 +27,12 @@ BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} -BuildRequires: libgnomeprintui-devel >= %{libgnomeprintui_version} -BuildRequires: libgnomeprint-devel >= %{libgnomeprint_version} +BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui_version} +BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: gail-devel >= %{gail_version} -# Fixes encoding problem for "Untitled" on Save As... -# (bugzilla.gnome.org #90879) -Patch1: gedit-2.0.2-untitled.patch +Patch1: gedit-2.2.0-recent-monitor.patch %description gEdit is a small but powerful text editor designed specifically for @@ -57,7 +55,7 @@ Install gedit-devel if you want to write plug-ins for gEdit. %prep %setup -n gedit-%{version} -q -%patch1 -p1 -b .untitled +%patch1 -p1 -b .recent-monitor %build @@ -83,6 +81,8 @@ desktop-file-install --vendor gnome --delete-original \ ## clean up all the static libs for plugins (workaround for no -module) /bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins -name "*.a"` +/bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper + %find_lang %{po_package} %clean @@ -108,14 +108,31 @@ scrollkeeper-update %{_datadir}/gnome %{_datadir}/idl %{_datadir}/omf +%{_datadir}/mime-info %{_datadir}/applications %{_mandir}/man1/* %{_libdir}/bonobo %{_libdir}/gedit-2 %{_bindir}/* %{_sysconfdir}/gconf/schemas/* +%{_datadir}/application-registry/gedit.applications %changelog +* Tue Feb 4 2003 Alexander Larsson 1:2.2.0-1 +- Update to 2.2.0 +- Add patch to disable recent files monitoring +- Bump libgnomeprint requirements + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Dec 13 2002 Tim Powers 1:2.1.4-1 +- update to 2.1.4 + +* Mon Dec 9 2002 Havoc Pennington +- 2.1.3 +- fix unpackaged files + * Thu Aug 15 2002 Owen Taylor - Add missing bonobo server files (#71261, Taco Witte) - Remove empty NEWS, FAQ files from %%doc (#66079) diff --git a/sources b/sources index 6b4cc9b..5429518 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -471c0a9c6a892acc39fb6cb363350b36 gedit-2.0.2.tar.bz2 +30627d1c185813cc3e20e0e868177938 gedit-2.2.0.tar.bz2