Author: arekm Date: Mon Feb 1 21:12:00 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; readd proper kde4 hotfix patch
---- Files affected:
packages/openoffice.org:
openoffice.org.spec (1.849 -> 1.850) , openoffice.org-hotfix-kde4.patch (1.2
-> 1.3)
---- Diffs:
================================================================
Index: packages/openoffice.org/openoffice.org.spec
diff -u packages/openoffice.org/openoffice.org.spec:1.849
packages/openoffice.org/openoffice.org.spec:1.850
--- packages/openoffice.org/openoffice.org.spec:1.849 Mon Feb 1 21:51:30 2010
+++ packages/openoffice.org/openoffice.org.spec Mon Feb 1 22:11:54 2010
@@ -78,7 +78,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
@@ -152,6 +152,7 @@
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,6 +2415,8 @@
%{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
@@ -2450,9 +2453,6 @@
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}
@@ -4612,6 +4612,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.850 2010/02/01 21:11:54 arekm
+- rel 3; readd proper kde4 hotfix patch
+
Revision 1.849 2010/02/01 20:51:30 arekm
- kde4 files fix
================================================================
Index: packages/openoffice.org/openoffice.org-hotfix-kde4.patch
diff -u /dev/null packages/openoffice.org/openoffice.org-hotfix-kde4.patch:1.3
--- /dev/null Mon Feb 1 22:12:00 2010
+++ packages/openoffice.org/openoffice.org-hotfix-kde4.patch Mon Feb 1
22:11:54 2010
@@ -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".])
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org.spec?r1=1.849&r2=1.850&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org-hotfix-kde4.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
