[libbonobo] Merge review fixes.

[Jon Ciesla]

commit 0164bf0b95dfa56c3f144dc9fb0aa615bb84a263
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Feb 7 13:32:34 2013 -0600

    Merge review fixes.

 libbonobo.spec |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/libbonobo.spec b/libbonobo.spec
index b64f102..30cf69b 100644
--- a/libbonobo.spec
+++ b/libbonobo.spec
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.32.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://download.gnome.org/sources/libbonobo/2.32/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -21,9 +21,6 @@ BuildRequires: gtk-doc
 BuildRequires: flex, bison, zlib-devel, popt-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: gettext
-# From 2.3, libbonobo swallowed bonobo-activation
-Obsoletes: bonobo-activation
-Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-multishlib.patch
 
@@ -38,11 +35,6 @@ Requires:  ORBit2-devel >= %{orbit2_version}
 Requires:  libxml2-devel >= %{libxml2_version}
 Requires:  popt-devel
 
-# From 2.3, libbonobo swallowed bonobo-activation
-Obsoletes: bonobo-activation-devel
-Provides: bonobo-activation-devel = %{version}-%{release}
-
-Conflicts: bonobo-devel < 1.0.8
 
 %description devel
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -120,6 +112,9 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/bonobo/servers
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Thu Feb 07 2013 Jon Ciesla <limburgher at gmail.com> - 2.32.1-4
+- Merge review fixes, BZ 225989.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.32.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild