Author: megabajt Date: Sun Jan 31 23:12:26 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- added -hotfix-kde4.patch
- release 2
---- Files affected:
packages/openoffice.org:
openoffice.org.spec (1.845 -> 1.846)
---- Diffs:
================================================================
Index: packages/openoffice.org/openoffice.org.spec
diff -u packages/openoffice.org/openoffice.org.spec:1.845
packages/openoffice.org/openoffice.org.spec:1.846
--- packages/openoffice.org/openoffice.org.spec:1.845 Sun Jan 31 13:33:40 2010
+++ packages/openoffice.org/openoffice.org.spec Mon Feb 1 00:12:21 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 1
+%define _rel 2
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
@@ -190,6 +191,7 @@
%endif
%if %{with kde4}
BuildRequires: kde4-kdelibs-devel
+BuildRequires: qt4-build
%endif
BuildRequires: libart_lgpl-devel
BuildRequires: libbonobo-devel >= 2.0
@@ -2413,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
@@ -4607,6 +4611,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.846 2010/01/31 23:12:21 megabajt
+- added -hotfix-kde4.patch
+- release 2
+
Revision 1.845 2010/01/31 12:33:40 megabajt
- added information how to get source tarballs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org.spec?r1=1.845&r2=1.846&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
