- updated ot version 1.1.2

[packages/eog.git] / eog.spec

diff --git a/eog.spec b/eog.spec
index 7bed5734b92d062061781cd1545fb3f2bb3de67c..01824f990f7474c4b6ef3310f34580ee681cae91 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -2,34 +2,38 @@ Summary:      The Eye of GNOME image viewer
 Summary(pl):   Oko GNOME - przegl±darka obrazków
 Summary(pt_BR):        Visualizador de imagem Eye of GNOME
 Name:          eog
-Version:       0.6
-Release:       2
+Version:       1.1.2
+Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/%{name}-%{version}.tar.gz
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/1.1/%{name}-%{version}.tar.bz2
 Source1:       %{name}.gif
-Patch0:                %{name}-am_ac.patch
+Patch0:                %{name}-am.patch
+Patch1:                %{name}-makefile.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf-devel >= 0.12
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bonobo-devel
-BuildRequires: bonobo-devel >= 0.35
-BuildRequires: gdk-pixbuf-gnome-devel >= 0.9.0
+BuildRequires: bonobo-activation-devel >= 2.1.0
+BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: gettext-devel
-BuildRequires: gnome-libs-devel
-BuildRequires: gnome-print-devel >= 0.25
+BuildRequires: gnome-vfs2-devel >= 2.0.3
 BuildRequires: intltool
-BuildRequires: libglade-gnome-devel
+BuildRequires: libbonoboui >= 2.1.0
+BuildRequires: libgnomeprint-devel >= 2.1.1
+BuildRequires: libgnomeui >= 2.1.1
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
+BuildRequires: librsvg-devel >= 2.1.1
 BuildRequires: libtool
-BuildRequires: oaf-devel >= 0.6.2
+BuildRequires: popt-devel
+Requires:      bonobo-activation >= 2.1.0
+Requires(post): GConf2
+Requires(post): scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-%define         _sysconfdir     /etc/X11/GNOME
+%define                _prefix                         /usr/X11R6
+%define                _sysconfdir             /etc/X11/GNOME2
+%define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
 
 %description
 Eye of GNOME is a tool for viewing/cataloging images.
@@ -44,28 +48,36 @@ Aplicativo para visualizar imagens chamado Eye of GNOME.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm -f missing
-%{__gettextize}
-%{__libtoolize}
-xml-i18n-toolize --copy --force
-aclocal -I %{_aclocaldir}/gnome
+sed -e 's/-ourdir/ourdir/' xmldocs.make >xmldocs.make.tmp
+mv xmldocs.make.tmp xmldocs.make
+glib-gettextize --copy --force
+libtoolize --copy --force
+intltoolize --copy --force
+aclocal -I %{_aclocaldir}/gnome2-macros
 %{__autoconf}
 %{__automake}
 %configure \
-       --with-bonobo
-%{__make}
+       --enable-platform-gnome-2
+%{__make} 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       Graphicsdir=%{_applnkdir}/Graphics
+       omf_dest_dir=%{_omf_dest_dir}/%{name}
 
 %find_lang %{name} --with-gnome
 
+%post
+%gconf_schema_install
+
+%postun -p /usr/bin/scrollkeeper-update
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -73,9 +85,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
-%{_applnkdir}/Graphics/*
-%{_datadir}/idl/*.idl
+%attr(755,root,root) %{_libdir}/eog-image-viewer
+%{_sysconfdir}/gconf/schemas/*
+%{_libdir}/bonobo/servers/*
 %{_datadir}/%{name}
-%{_datadir}/gnome/ui/*
-%{_datadir}/oaf/*.oaf
-%{_pixmapsdir}/%{name}
+%{_datadir}/applications/*
+%{_datadir}/gnome-2.0/ui/*
+%{_datadir}/idl/*
+%{_omf_dest_dir}/%{name}
+%{_pixmapsdir}/*