- rel 3; readd proper kde4 hotfix patch

Changed files:
    libreoffice.spec -> 1.850
    openoffice.org-hotfix-kde4.patch -> 1.3

diff --git a/libreoffice.spec b/libreoffice.spec
index 3e90a12e5fb75b5cb5f3134cf515dd44dea5ead0..e47631de177c93d5da41a65307df165a6c611ac8 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -77,7 +77,7 @@
 %define                tag                     %(echo %{mws} | tr A-Z a-z)-%{milestone}
 %define                milestone       m11
 %define                _tag            %(echo %{tag} | tr - _)
-%define                _rel            2
+%define                _rel            3
 
 Summary:       OpenOffice.org - powerful office suite
 Summary(pl.UTF-8):     OpenOffice.org - potężny pakiet biurowy
@@ -151,6 +151,7 @@ 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
@@ -2413,6 +2414,8 @@ 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
@@ -2449,9 +2452,6 @@ export DESTDIR=$RPM_BUILD_ROOT
 export IGNORE_MANIFEST_CHANGES=1
 export QTINC="%{_includedir}/qt"
 export QTLIB="%{_libdir}"
-
-export QT4INC="%{_includedir}/qt4"
-export QT4LIB="%{_libdir}"
 export QT4DIR="%{_libdir}/qt4"
 
 %if %{with java}

diff --git a/openoffice.org-hotfix-kde4.patch b/openoffice.org-hotfix-kde4.patch
new file mode 100644 (file)
index 0000000..21f7e58
--- /dev/null
+++ b/openoffice.org-hotfix-kde4.patch
@@ -0,0 +1,11 @@
+--- configure.in~      2010-02-01 22:04:43.000000000 +0100
++++ configure.in       2010-02-01 22:07:21.307930913 +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, no, [$QT4DIR/bin:$PATH])
+    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".])