- setting QT4DIR looks to be enough, no need for a patch

Changed files:
    libreoffice.spec -> 1.847
    openoffice.org-hotfix-kde4.patch -> 1.2

diff --git a/libreoffice.spec b/libreoffice.spec
index e80951302ed9e71014e93a6300b591dc5777bc1d..0988d1a51a814e9b1f9b811062384989382b8406 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -151,7 +151,6 @@ Source53:   %{name}-splash.bmp
 Source54:      %{name}-about.bmp
 # patches applied in prep section
 Patch0:                %{name}-PLD.patch
-Patch10:       %{name}-hotfix-kde4.patch
 URL:           http://www.openoffice.org/
 BuildRequires: /usr/bin/getopt
 BuildRequires: GConf2-devel
@@ -2414,8 +2413,6 @@ ln -sf %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
        %{SOURCE52} \
        src
 
-ln -s %{PATCH10} patches/hotfixes/%{basename:%{PATCH10}}.diff
-
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
 if [ ! -f /proc/cpuinfo ]; then
@@ -2452,6 +2449,7 @@ export DESTDIR=$RPM_BUILD_ROOT
 export IGNORE_MANIFEST_CHANGES=1
 export QTINC="%{_includedir}/qt"
 export QTLIB="%{_libdir}"
+export QT4DIR="%{_libdir}/qt4"
 
 %if %{with java}
 export JAVA_HOME="%{java_home}"

diff --git a/openoffice.org-hotfix-kde4.patch b/openoffice.org-hotfix-kde4.patch
deleted file mode 100644 (file)
index ab22060..0000000
--- a/openoffice.org-hotfix-kde4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in       2010-01-30 20:54:14.014499069 +0100
-+++ configure.in.new   2010-01-30 21:07:03.703592227 +0100
-@@ -6443,7 +6443,7 @@
-    fi
- 
-    dnl Check for Meta Object Compiler
--   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
-+   AC_PATH_PROG( MOC4, moc-qt4, no, [$PATH:$QT4DIR/bin] )
-    if test "$MOC4" = "no" ; then
-       AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
- the root of your Qt installation by exporting QT4DIR before running "configure".])