packages: openoffice.org/openoffice.org.spec, openoffice.org/openoffice.org...

[arekm]

Author: arekm                        Date: Mon Feb  1 09:02:43 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- setting QT4DIR looks to be enough, no need for a patch

---- Files affected:
packages/openoffice.org:
   openoffice.org.spec (1.846 -> 1.847) , openoffice.org-hotfix-kde4.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/openoffice.org/openoffice.org.spec
diff -u packages/openoffice.org/openoffice.org.spec:1.846 packages/openoffice.org/openoffice.org.spec:1.847
--- packages/openoffice.org/openoffice.org.spec:1.846	Mon Feb  1 00:12:21 2010
+++ packages/openoffice.org/openoffice.org.spec	Mon Feb  1 10:02:34 2010
@@ -152,7 +152,6 @@
 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
@@ -2415,8 +2414,6 @@
 	%{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
@@ -2453,6 +2450,7 @@
 export IGNORE_MANIFEST_CHANGES=1
 export QTINC="%{_includedir}/qt"
 export QTLIB="%{_libdir}"
+export QT4DIR="%{_libdir}/qt4"
 
 %if %{with java}
 export JAVA_HOME="%{java_home}"
@@ -4611,6 +4609,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.847  2010/02/01 09:02:34  arekm
+- setting QT4DIR looks to be enough, no need for a patch
+
 Revision 1.846  2010/01/31 23:12:21  megabajt
 - added -hotfix-kde4.patch
 - release 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org.spec?r1=1.846&r2=1.847&f=u