rpms/libbonoboui/devel libbonoboui.spec,1.72,1.73

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/libbonoboui/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31105

Modified Files:
	libbonoboui.spec 
Log Message:
Fixes from merge review (#225990)



Index: libbonoboui.spec
===================================================================
RCS file: /cvs/extras/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- libbonoboui.spec	31 Mar 2010 01:25:53 -0000	1.72
+++ libbonoboui.spec	10 Jul 2010 02:49:08 -0000	1.73
@@ -1,13 +1,12 @@
 %define libxml2_version 2.5
 %define orbit2_version 2.5.1
-%define bonobo_activation_version 2.2.0
-%define libbonobo_version 2.3.6
+%define libbonobo_version 2.13.0
 %define libgnomecanvas_version 2.0.1
 %define libgnome_version 2.13.7
 %define libart_lgpl_version 2.3.8
-%define gtk2_version 2.2.0
+%define gtk2_version 2.6.0
 %define libglade2_version 2.0.0
-%define glib2_version 2.2.0
+%define glib2_version 2.6.0
 
 %define po_package libbonoboui-2.0
 
@@ -18,8 +17,7 @@ Release: 1%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/libbonoboui
 Source0: http://download.gnome.org/sources/libbonoboui/2.24/%{name}-%{version}.tar.bz2
-License: GPLv2+ and LGPLv2+
-# bonobo-browser is GPL, libbonoboui is LGPL
+License: LGPLv2+
 Group: System Environment/Libraries
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -34,9 +32,7 @@ BuildRequires: gtk2-devel >= %{gtk2_vers
 BuildRequires: libglade2-devel >= %{libglade2_version}
 BuildRequires: intltool >= 0.14-1
 BuildRequires: libtool >= 1.4.2-12
-BuildRequires: automake autoconf
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: libXt-devel
 BuildRequires: gettext
 
 %description
@@ -48,6 +44,8 @@ that come with Bonobo.
 %package devel
 Summary: Libraries and headers for libbonoboui
 Group: Development/Libraries
+License: GPLv2+ and LGPLv2+
+# bonobo-browser is GPL, libbonoboui is LGPL
 Requires: %name = %{version}-%{release}
 Requires: libxml2-devel >= %{libxml2_version}
 Requires: ORBit2-devel >= %{orbit2_version}
@@ -75,12 +73,14 @@ use libbonoboui.
 %build
 
 %configure --disable-gtk-doc --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT ## LIBTOOL=/usr/bin/libtool
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.la
@@ -102,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{po_package}.lang
 %defattr(-,root,root)
-%doc COPYING AUTHORS NEWS README
+%doc COPYING.LIB NEWS README
 %{_libdir}/lib*.so.*
 %{_libdir}/libglade/2.0/*.so
 %{_libdir}/bonobo/servers/*
@@ -110,6 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
+%doc COPYING COPYING.LIB
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*