packages: libreoffice/libreoffice.spec, libreoffice/libreoffice-hotfix-kde4...

[megabajt]

Author: megabajt                     Date: Fri Dec 24 09:08:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed build with kde4 (-hotfix-kde4.patch)

---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.875 -> 1.876) , libreoffice-hotfix-kde4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.875 packages/libreoffice/libreoffice.spec:1.876
--- packages/libreoffice/libreoffice.spec:1.875	Thu Dec 23 23:49:57 2010
+++ packages/libreoffice/libreoffice.spec	Fri Dec 24 10:08:00 2010
@@ -168,6 +168,7 @@
 Patch0:		%{name}-build-apply.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=31871
 Patch100:	%{name}-hotfix-with-lang-all.patch
+Patch101:	%{name}-hotfix-kde4.patch
 URL:		http://www.documentfoundation.org/
 BuildRequires:	libwpd-devel >= 0.9.0
 BuildRequires:	libwps-devel >= 0.2.0
@@ -2577,6 +2578,7 @@
 	src
 
 ln -s %{PATCH100} patches/hotfixes/%{basename:%{PATCH100}}.diff
+ln -s %{PATCH101} patches/hotfixes/%{basename:%{PATCH101}}.diff
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -3729,6 +3731,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{ooobasisdir}/program/kde-open-url
 %attr(755,root,root) %{ooobasisdir}/program/fps_kde4.uno.so
+%attr(755,root,root) %{ooobasisdir}/program/kde4be1.uno.so
 %attr(755,root,root) %{ooobasisdir}/program/libvclplug_kde4*.so
 %endif
 
@@ -4420,6 +4423,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.876  2010/12/24 09:08:00  megabajt
+- fixed build with kde4 (-hotfix-kde4.patch)
+
 Revision 1.875  2010/12/23 22:49:57  megabajt
 - updated to 3.3.0.2
 

================================================================
Index: packages/libreoffice/libreoffice-hotfix-kde4.patch
diff -u /dev/null packages/libreoffice/libreoffice-hotfix-kde4.patch:1.1
--- /dev/null	Fri Dec 24 10:08:06 2010
+++ packages/libreoffice/libreoffice-hotfix-kde4.patch	Fri Dec 24 10:08:01 2010
@@ -0,0 +1,11 @@
+--- configure.in	2010-12-23 21:13:50.725568590 +0100
++++ configure.innew	2010-12-24 01:01:55.513183619 +0100
+@@ -7090,7 +7090,7 @@
+    fi
+ 
+    dnl Check for Meta Object Compiler
+-   AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$PATH:$QT4DIR/bin] )
++   AC_PATH_PROG( MOC4, moc, no, [$QT4DIR/bin:`dirname $qt_lib_dir`/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".])
================================================================

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