- there is no need to patch anything, just don't set DESTDIR at build time

Changed files:
    libreoffice-buildpath.patch -> 1.2
    libreoffice.spec -> 1.933

diff --git a/libreoffice-buildpath.patch b/libreoffice-buildpath.patch
deleted file mode 100644 (file)
index b4c4dec..0000000
--- a/libreoffice-buildpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 10d6fa29fbe128d5441bc37423dea8b0afdb72a3..9fc56b803d0e66b5782f4892d60f8f5cc513a394 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -80,7 +80,6 @@ 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
@@ -2438,7 +2437,6 @@ 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
@@ -2485,7 +2483,6 @@ export CPP="%{__cpp}"
 %{__aclocal}
 %{__autoconf}
 
-export DESTDIR=$RPM_BUILD_ROOT
 export IGNORE_MANIFEST_CHANGES=1
 export QT4INC="%{_includedir}/qt4"
 export QT4LIB="%{_libdir}"