- massive attack: do not put bonobo servers into /usr/lib; remove

  _bonobo_server_dir definition (bonobo-activation configuration
  should be modified to look for servers in /usr and /usr/X11R6)

Changed files:
    eog.spec -> 1.26

diff --git a/eog.spec b/eog.spec
index b398365e0c0443f2aa66a2e28e283c6eb462894e..aa10a06349fa9daf86b3ed4894fe800ed0b62caa 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -3,7 +3,7 @@ Summary(pl):    Oko GNOME - przegl
 Summary(pt_BR):        Visualizador de imagem Eye of GNOME
 Name:          eog
 Version:       1.1.2
-Release:       2
+Release:       3
 License:       GPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/1.1/%{name}-%{version}.tar.bz2
@@ -33,8 +33,6 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix                 /usr/X11R6
 %define                _sysconfdir             /etc/X11/GNOME2
-%define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
-%define                _bonobo_server_dir              /usr/lib/bonobo/servers
 
 %description
 Eye of GNOME is a tool for viewing/cataloging images.
@@ -70,8 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       omf_dest_dir=%{_omf_dest_dir}/%{name} \
-       serverdir=%{_bonobo_server_dir}
+       omf_dest_dir=%{_omf_dest_dir}/%{name} 
 
 %find_lang %{name} --with-gnome
 
@@ -89,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/eog-image-viewer
 %{_sysconfdir}/gconf/schemas/*
-%{_bonobo_server_dir}/*
+%{_libdir}/bonobo/servers/*
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_datadir}/gnome-2.0/ui/*