- 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:
    gnome-panel.spec -> 1.57

diff --git a/gnome-panel.spec b/gnome-panel.spec
index d83956b91d62e79771fc2d6256d82e03dd698fe5..de1d73253accf56571d4d060040d8f1d163e6274 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -2,7 +2,7 @@ Summary:        The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-panel
 Version:       2.1.3
-Release:       1
+Release:       2
 License:       LGPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
@@ -33,8 +33,6 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define         _mandir         %{_prefix}/man
 %define         _sysconfdir     /etc/X11/GNOME2
 %define                _gtkdocdir      %{_defaultdocdir}/gtk-doc/html
-%define         _omf_dest_dir   %(scrollkeeper-config --omfdir)
-%define                _bonobo_server_dir      /usr/lib/bonobo/servers
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -102,8 +100,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        omf_dest_dir=%{_omf_dest_dir}/%{name} \
        pkgconfigdir=%{_pkgconfigdir} \
-       HTML_DIR=%{_gtkdocdir} \
-       serverdir=%{_bonobo_server_dir}
+       HTML_DIR=%{_gtkdocdir}
 
 mv ChangeLog main-ChangeLog
 find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
@@ -132,7 +129,7 @@ scrollkeeper-update
 %attr(755,root,root) %{_libdir}/libpanel-applet*.so.*.*
 %attr(755,root,root) %{_libdir}/libgen_util_applet*.so
 %attr(755,root,root) %{_libdir}/%{name}/libnotification-area-applet.so
-%{_bonobo_server_dir}/*
+%{_libdir}/bonobo/servers/*
 %{_datadir}/control-center-2.0/capplets/*
 %{_datadir}/gen_util
 %{_datadir}/gnome/panel