diff --git a/.cvsignore b/.cvsignore index f060564..1a7995a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -eog-0.118.0.tar.bz2 +eog-1.0.1.tar.bz2 diff --git a/eog.spec b/eog.spec index bca6fd6..147b222 100644 --- a/eog.spec +++ b/eog.spec @@ -1,12 +1,15 @@ -%define glib2_version 2.0.0 -%define gtk2_version 2.0.2 -%define libgnomeui_version 1.117.1 -%define libgnomeprint_version 1.113.0 +%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 desktop_file_utils_version 0.2.90 +%define gail_version 0.17-2 Summary: Eye of GNOME image viewer Name: eog -Version: 0.118.0 -Release: 4 +Version: 1.0.1 +Release: 2 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2 License: GPL @@ -14,9 +17,14 @@ Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-root BuildRequires: glib2-devel >= %{glib2_version} +BuildRequires: pango-devel >= %{pango_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: libgnomeprint-devel >= %{libgnomeprint_version} +BuildRequires: Xft +BuildRequires: fontconfig +BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} +BuildRequires: gail-devel >= %{gail_version} %description @@ -37,6 +45,15 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 %makeinstall unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL +## http://bugzilla.gnome.org/show_bug.cgi?id=89379 +perl -pi -e 's/Categories=Application;Graphics/Categories=Application;Graphics;/' $RPM_BUILD_ROOT%{_datadir}/applications/* + +desktop-file-install --vendor gnome --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Red-Hat-Extra \ + --copy-generic-name-to-name \ + $RPM_BUILD_ROOT%{_datadir}/applications/* + %find_lang %{name} %clean @@ -64,8 +81,23 @@ done %{_bindir}/* %{_sysconfdir}/gconf/schemas/*.schemas - %changelog +* Mon Jul 29 2002 Havoc Pennington +- copy generic name to name and move to -Extra + +* Mon Jul 29 2002 Havoc Pennington +- 1.0.1, rebuild with new gail + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun Jun 16 2002 Havoc Pennington +- 1.0.0 +- use desktop-file-install + +* Fri Jun 07 2002 Havoc Pennington +- rebuild in different environment + * Wed Jun 05 2002 Havoc Pennington - rebuild in different environment diff --git a/sources b/sources index 9232399..9cbe410 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fae0e84698a995d835710b77b0240222 eog-0.118.0.tar.bz2 +0870d7a21aa33bc6c959ec8a83d0e003 eog-1.0.1.tar.bz2