diff --git a/.cvsignore b/.cvsignore index ddb8380..6fe45ca 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gedit-2.2.0.tar.bz2 +gedit-2.4.0.tar.bz2 diff --git a/gedit.spec b/gedit.spec index 1dbefb9..bb538ce 100644 --- a/gedit.spec +++ b/gedit.spec @@ -1,18 +1,20 @@ -%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 glib2_version 2.2.0 +%define pango_version 1.2.0 +%define gtk2_version 2.2.0 +%define libgnomeui_version 2.4.0 +%define libgnomeprint_version 2.3.0 +%define libgnomeprintui_version 2.3.0 %define desktop_file_utils_version 0.3 -%define gail_version 0.17-3 +%define eel2_version 2.4.0 +%define gail_version 1.2.0 +%define gtksourceview_version 0.6 -%define po_package gedit-2.0 +%define po_package gedit-2.4 Summary: gEdit is a small but powerful text editor for GNOME. Name: gedit -Version: 2.2.0 -Release: 1 +Version: 2.4.0 +Release: 3 Epoch: 1 License: GPL Group: Applications/Editors @@ -23,6 +25,11 @@ BuildRoot: %{_tmppath}/gedit-%{version}-root PreReq: scrollkeeper >= 0.1.4 PreReq: GConf2 +# http://bugzilla.gnome.org/show_bug.cgi?id=124052 +Patch1: gedit-2.4.0-shelloutput.patch +# http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=103933 +Patch2: gedit-2.4.0-64bit.patch + BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: gtk2-devel >= %{gtk2_version} @@ -30,10 +37,16 @@ BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui_version} BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} +BuildRequires: aspell-devel +BuildRequires: eel2-devel >= %{eel2_version} BuildRequires: gail-devel >= %{gail_version} +BuildRequires: gtksourceview-devel >= %{gtksourceview_version} +BuildRequires: automake >= 1.7 -Patch1: gedit-2.2.0-recent-monitor.patch - +Requires: eel2 >= %{eel2_version} +Requires: libgnomeui >= %{libgnomeui_version} +Requires: libgnomeprintui22 >= %{libgnomeprintui_version} +Requires: gtksourceview >= %{gtksourceview_version} %description gEdit is a small but powerful text editor designed specifically for the GNOME GUI desktop. gEdit includes a plug-in API (which supports @@ -55,10 +68,15 @@ Install gedit-devel if you want to write plug-ins for gEdit. %prep %setup -n gedit-%{version} -q -%patch1 -p1 -b .recent-monitor + +%patch1 -p1 -b .shelloutput +%patch2 -p1 -b .64bit %build +aclocal-1.7 +automake-1.7 +autoconf %configure make @@ -80,6 +98,7 @@ 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 -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins -name "*.la"` /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper @@ -115,9 +134,54 @@ scrollkeeper-update %{_libdir}/gedit-2 %{_bindir}/* %{_sysconfdir}/gconf/schemas/* +%{_datadir}/gnome-2.0/ui/gedit-viewer-ui.xml %{_datadir}/application-registry/gedit.applications + +%files devel +%defattr(-, root, root) +%{_includedir}/gedit-2.4 +%{_libdir}/pkgconfig/gedit-2.4.pc + %changelog +* Tue Oct 21 2003 Matt Wilson 1:2.4.0-3 +- eel_read_entire_file takes a pointer to an int, not to a gsize + (#103933) + +* Tue Oct 7 2003 Owen Taylor 1:2.4.0-2 +- Fix bug with multibyte chars in shell-output plugin (#104027, Jens Petersen) +- Add missing BuildRequires on eel2, aspell-devel (#87746, Alan Cox) +- Add versioned Requires on eel2, libgnomeui (#103363, Jens Petersen) + +* Fri Oct 3 2003 Alexander Larsson 1:2.4.0-1 +- 2.4.0 + +* Mon Sep 22 2003 Bill Nottingham 1:2.3.5-2 +- fix defattr (#103333) + +* Tue Aug 26 2003 Jonathan Blandford +- require the new gtksourceview + +* Fri Aug 15 2003 Jonathan Blandford 1:2.3.3-1 +- update for GNOME 2.4 + +* Tue Jul 29 2003 Havoc Pennington 1:2.2.2-2 +- rebuild + +* Mon Jul 7 2003 Havoc Pennington 1:2.2.2-1 +- 2.2.2 +- fix name of gettext domain +- remove recent-monitor patch now upstream + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Thu May 1 2003 Havoc Pennington 1:2.2.0-3 +- patch configure.in for new aspell + +* Mon Apr 28 2003 Tim Powers 1:2.2.0-2 +- rebuild to fix broken libpspell deps + * Tue Feb 4 2003 Alexander Larsson 1:2.2.0-1 - Update to 2.2.0 - Add patch to disable recent files monitoring diff --git a/sources b/sources index 5429518..f91cb5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30627d1c185813cc3e20e0e868177938 gedit-2.2.0.tar.bz2 +0d8039773fd2f533bec4c9653854a4de gedit-2.4.0.tar.bz2