[packages/libbonobo] - automake fix - rel 5

baggins baggins at pld-linux.org
Sat Dec 7 16:16:04 CET 2013


commit ba1cb20d7ab6e4bea1a165ebb02e1300317eea43
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Dec 7 16:15:54 2013 +0100

    - automake fix
    - rel 5

 am.patch       | 17 +++++++++++++++++
 libbonobo.spec |  4 +++-
 2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/libbonobo.spec b/libbonobo.spec
index c934ad0..ffb300f 100644
--- a/libbonobo.spec
+++ b/libbonobo.spec
@@ -7,12 +7,13 @@ Summary(pl.UTF-8):	Biblioteka do łączenia dokumentów w GNOME
 Summary(pt_BR.UTF-8):	Biblioteca para documentos compostos no GNOME
 Name:		libbonobo
 Version:	2.32.1
-Release:	4
+Release:	5
 License:	LGPL v2+ (libraries), GPL v2+ (programs)
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.32/%{name}-%{version}.tar.bz2
 # Source0-md5:	27fa902d4fdf6762ee010e7053aaf77b
 Patch0:		%{name}-glib.patch
+Patch1:		am.patch
 URL:		http://www.gnome.org/
 BuildRequires:	ORBit2-devel >= 1:2.14.8
 BuildRequires:	autoconf >= 2.59
@@ -118,6 +119,7 @@ Dokumentacja API libbonobo.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %{__sed} -i -e 's|/lib|/%{_lib}|g' utils/bonobo-slay.in
 
 %build
diff --git a/am.patch b/am.patch
new file mode 100644
index 0000000..2bd2c5f
--- /dev/null
+++ b/am.patch
@@ -0,0 +1,17 @@
+--- libbonobo-2.32.1/tests/Makefile.am~	2010-08-29 13:56:00.000000000 +0200
++++ libbonobo-2.32.1/tests/Makefile.am	2013-12-07 16:13:24.602880103 +0100
+@@ -51,11 +51,11 @@
+ 	LD_LIBRARY_PATH="$(top_builddir)/bonobo/.libs:$$LD_LIBRARY_PATH"	\
+ 	PATH="$(top_builddir)/bonobo/.libs:$$PATH"	\
+ 	BONOBO_PLUGIN_PATH="$(top_builddir)/storage-modules/.libs:$$BONOBO_PLUGIN_PATH"\
+-	BONOBO_ACTIVATION_PATH="$(srcdir)$(SEARCHPATHSEP)$$BONOBO_ACTIVATION_PATH"\
+-	MODELS_DIR="$(srcdir)/models"
++	BONOBO_ACTIVATION_PATH="$(top_srcdir)/tests/$(SEARCHPATHSEP)$$BONOBO_ACTIVATION_PATH"\
++	MODELS_DIR="$(top_srcdir)/tests/models"
+ 
+ TESTS = test-moniker$(EXEEXT) test-event-source$(EXEEXT) test-object$(EXEEXT) \
+-	test-stream-mem$(EXEEXT) $(srcdir)/test-properties.sh test-storage-mem$(EXEEXT) \
++	test-stream-mem$(EXEEXT) test-properties.sh test-storage-mem$(EXEEXT) \
+ 	test-main-loop$(EXEEXT)
+ 
+ # TESTS += test-generic-factory.sh
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libbonobo.git/commitdiff/ba1cb20d7ab6e4bea1a165ebb02e1300317eea43



More information about the pld-cvs-commit mailing list