- 2.15.4, updated deps, --as-needed support

[packages/eog.git] / eog.spec

diff --git a/eog.spec b/eog.spec
index 5e7e7443f939977531935659fd95edb18147cc99..b8c4bef0a231b96e09801b136ac784887ad4187d 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -2,35 +2,39 @@ 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:       1.1.3
-Release:       2
-License:       GPL
+Version:       2.15.4
+Release:       1
+License:       GPL v2
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/1.1/%{name}-%{version}.tar.bz2
-Source1:       %{name}.gif
-Patch0:                %{name}-am.patch
-Patch1:                %{name}-makefile.patch
-Patch2:                %{name}-libtool.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/eog/2.15/%{name}-%{version}.tar.bz2
+# Source0-md5: 6005450c992cf3f94b3fe3c001e010e1
+Patch0:                %{name}-libtool.patch
+Patch1:                %{name}-desktop.patch
 URL:           http://www.gnome.org/
+BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bonobo-activation-devel >= 2.1.0-3
-BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: gettext-devel
-BuildRequires: gnome-vfs2-devel >= 2.1.3-3
-BuildRequires: intltool
-BuildRequires: libbonoboui >= 2.1.0
-BuildRequires: libgnomeprint-devel >= 2.1.1
-BuildRequires: libgnomeui >= 2.1.1
+BuildRequires: gnome-common >= 2.12.0
+BuildRequires: gnome-desktop-devel >= 2.15.4
+BuildRequires: gnome-vfs2-devel >= 2.15.3
+BuildRequires: intltool >= 0.35
+BuildRequires: lcms-devel
+BuildRequires: libart_lgpl-devel >= 2.3.17
+BuildRequires: libexif-devel >= 1:0.6.12
+BuildRequires: libglade2-devel >= 1:2.6.0
+BuildRequires: libgnomeprintui-devel
+BuildRequires: libgnomeui-devel >= 2.15.2
 BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: librsvg-devel >= 2.1.1
 BuildRequires: libtool
+BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: popt-devel
-BuildRequires: Xft-devel >= 2.0-6
-Requires:      bonobo-activation >= 2.1.0
-Requires(post): GConf2
-Requires(post): scrollkeeper
+BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: scrollkeeper
+Requires(post,preun):  GConf2
+Requires(post,postun): desktop-file-utils
+Requires(post,postun): scrollkeeper
+Requires:      libgnomeui >= 2.15.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,50 +51,53 @@ Aplicativo para visualizar imagens chamado Eye of GNOME.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-rm -f missing
-sed -e 's/-ourdir/ourdir/' xmldocs.make >xmldocs.make.tmp
-mv xmldocs.make.tmp xmldocs.make
-glib-gettextize --copy --force
 %{__libtoolize}
-intltoolize --copy --force
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
-%{__autoconf}
+%{__intltoolize}
+%{__aclocal}
+%{__autoheader}
+%{__gnome_doc_common}
 %{__automake}
-
+%{__autoconf}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure \
-       --enable-platform-gnome-2
-%{__make} 
+       --disable-schemas-install \
+       --disable-scrollkeeper
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       omf_dest_dir=%{_omf_dest_dir}/%{name} 
+       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/{tk,ug}
 
 %find_lang %{name} --with-gnome
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post
-%gconf_schema_install
+%gconf_schema_install eog.schemas
+%scrollkeeper_update_post
+%update_desktop_database_post
 
-%postun -p /usr/bin/scrollkeeper-update
+%preun
+%gconf_schema_uninstall eog.schemas
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%postun
+%scrollkeeper_update_postun
+%update_desktop_database_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/eog-image-viewer
-%{_sysconfdir}/gconf/schemas/*
-%{_libdir}/bonobo/servers/*
+%{_sysconfdir}/gconf/schemas/eog.schemas
 %{_datadir}/%{name}
-%{_datadir}/applications/*
-%{_datadir}/gnome-2.0/ui/*
-%{_datadir}/idl/*
 %{_omf_dest_dir}/%{name}
+%{_desktopdir}/*
 %{_pixmapsdir}/*