- make build path absolute to make some tools happy

- BR java-hamcrest

Changed files:
    libreoffice-buildpath.patch -> 1.1
    libreoffice.spec -> 1.931

diff --git a/libreoffice-buildpath.patch b/libreoffice-buildpath.patch
new file mode 100644 (file)
index 0000000..b4c4dec
--- /dev/null
+++ b/libreoffice-buildpath.patch
@@ -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

diff --git a/libreoffice.spec b/libreoffice.spec
index 35444d7e580ee61d3e0109a1696932a9adf19828..78dc0572c5dccaa879aaa908fdaac5208989df1f 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -81,6 +81,7 @@ Source29:     http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a33504
 # 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
@@ -122,6 +123,7 @@ BuildRequires:      java-commons-httpclient
 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
@@ -2437,6 +2439,7 @@ bashowe uzupełnianie nazw dla LibreOffice.
 %prep
 %setup -q -n %{name}-core-%{version} -a1 -a2 -a3 -a4
 
+%patch0 -p1
 %patch1 -p0
 
 for dir in *-%{version}; do