packages: libreoffice/libreoffice.spec, libreoffice/libreoffice-buildpath.p...

[baggins]

Author: baggins                      Date: Fri Feb 24 13:21:35 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make build path absolute to make some tools happy
- BR java-hamcrest

---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.930 -> 1.931) , libreoffice-buildpath.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.930 packages/libreoffice/libreoffice.spec:1.931
--- packages/libreoffice/libreoffice.spec:1.930	Thu Feb 23 19:11:09 2012
+++ packages/libreoffice/libreoffice.spec	Fri Feb 24 14:21:30 2012
@@ -82,6 +82,7 @@
 # Source29-md5:	18f577b374d60b3c760a3a3350407632
 Source30:	http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 # Source30-md5:	17410483b5b5f267aa18b7e00b65e6e0
+Patch0:		%{name}-buildpath.patch
 Patch1:		%{name}-hamcrest.patch
 URL:		http://www.documentfoundation.org/
 BuildRequires:	/usr/bin/getopt
@@ -123,6 +124,7 @@
 BuildRequires:	java-commons-lang
 BuildRequires:	java-commons-logging
 BuildRequires:	java-flow-engine
+BuildRequires:	java-hamcrest
 %{?with_system_hsqldb:BuildRequires:	java-hsqldb}
 BuildRequires:	java-junit
 BuildRequires:	java-lucene
@@ -2438,6 +2440,7 @@
 %prep
 %setup -q -n %{name}-core-%{version} -a1 -a2 -a3 -a4
 
+%patch0 -p1
 %patch1 -p0
 
 for dir in *-%{version}; do
@@ -4080,6 +4083,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.931  2012/02/24 13:21:30  baggins
+- make build path absolute to make some tools happy
+- BR java-hamcrest
+
 Revision 1.930  2012/02/23 18:11:09  blekot
 - patch for junit withour hamcrest in configure.in
 

================================================================
Index: packages/libreoffice/libreoffice-buildpath.patch
diff -u /dev/null packages/libreoffice/libreoffice-buildpath.patch:1.1
--- /dev/null	Fri Feb 24 14:21:35 2012
+++ packages/libreoffice/libreoffice-buildpath.patch	Fri Feb 24 14:21:30 2012
@@ -0,0 +1,11 @@
+--- libreoffice-core-3.5.0.3/solenv/inc/gbuildbridge.mk~	2012-02-01 13:56:49.000000000 +0100
++++ libreoffice-core-3.5.0.3/solenv/inc/gbuildbridge.mk	2012-02-24 10:44:43.180660504 +0100
+@@ -25,7 +25,7 @@
+ #
+ #*************************************************************************
+ 
+-PRJ=..
++PRJ=$(shell pwd)/..
+ TARGET=prj
+ 
+ .INCLUDE : settings.mk
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libreoffice/libreoffice.spec?r1=1.930&r2=1.931&f=u