rpms/libbonobo/devel install-dupe.patch, NONE, 1.1 libbonobo.spec, 1.87, 1.88

Matthias Clasen mclasen at fedoraproject.org
Mon Jun 15 00:35:13 UTC 2009


Author: mclasen

Update of /cvs/pkgs/rpms/libbonobo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3587

Modified Files:
	libbonobo.spec 
Added Files:
	install-dupe.patch 
Log Message:
fix installation


install-dupe.patch:

--- NEW FILE install-dupe.patch ---
diff -up libbonobo-2.24.1/bonobo-activation/Makefile.am.install-dupe libbonobo-2.24.1/bonobo-activation/Makefile.am
--- libbonobo-2.24.1/bonobo-activation/Makefile.am.install-dupe	2009-06-14 20:14:27.124324123 -0400
+++ libbonobo-2.24.1/bonobo-activation/Makefile.am	2009-06-14 20:14:31.278614729 -0400
@@ -36,7 +36,6 @@ bonobo_activationinclude_HEADERS=		\
 	bonobo-activation-shlib.h		\
 	bonobo-activation-register.h		\
 	bonobo-activation-server-info.h		\
-	bonobo-activation-async.h		\
 	bonobo-activation-version.h		\
 	$(NULL)
 


Index: libbonobo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- libbonobo.spec	14 Jun 2009 23:11:11 -0000	1.87
+++ libbonobo.spec	15 Jun 2009 00:34:41 -0000	1.88
@@ -27,6 +27,7 @@ Obsoletes: bonobo-activation
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-multishlib.patch
+Patch1: install-dupe.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -59,6 +60,8 @@ use Bonobo.
 %patch0 -p1 -b .multishlib
 %endif
 
+%patch1 -p1 -b .install-dupe
+
 %build
 intltoolize -f
 aclocal
@@ -131,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sun Jun 14 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2
 - Minor directory ownership cleanup
+- Fix installation
 
 * Sun Mar 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.1-1
 - Update to 2.24.1




More information about the fedora-extras-commits mailing list