[libreoffice] fix java-devel dep

[David Tardon]

commit 9390cab8ee795c1ba6f66d6adf9c774c4eeabf3b
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Dec 11 17:28:39 2011 +0100

    fix java-devel dep

 ...bz-759647-dispose-clears-mpPresTimer-befo.patch |   34 -----------------
 ...et-the-logic-straight-for-center-across-s.patch |   38 --------------------
 libreoffice.spec                                   |   14 +------
 3 files changed, 2 insertions(+), 84 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index f0ad520..273653e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -27,7 +27,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        3.4.4.2
-Release:        7%{?dist}
+Release:        5%{?dist}
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -71,7 +71,7 @@ Source32:       http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac
 Source33:       http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
 %endif
 BuildRequires:  zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
-BuildRequires:  binutils, java-devel <= 1.6.0, boost-devel, zlib-devel
+BuildRequires:  binutils, java-devel < 1.7.0, boost-devel, zlib-devel
 BuildRequires:  python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
 BuildRequires:  neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel
 BuildRequires:  libXext-devel, libXt-devel, libICE-devel, libjpeg-devel, make
@@ -149,8 +149,6 @@ Patch40: solenv.fix.mk.inheritance.patch
 Patch41: libreoffice-ppc64.patch
 Patch42: 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch
 Patch43: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
-Patch44: 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch
-Patch45: 0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -840,8 +838,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch41 -p1 -b .libreoffice-ppc64.patch
 %patch42 -p1 -b .rhbz751290-KDE-black-on-dark-tooltips.patch
 %patch43 -p1 -b .fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
-%patch44 -p1 -b .rhbz759647-dispose-clears-mpPresTimer-befo.patch
-%patch45 -p1 -b .fdo43308-Set-the-logic-straight-for-center-across-s.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2150,12 +2146,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Fri Dec 09 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.4.2-7
-- Resolves: rhbz#761558 center-across-selection fix
-
-* Wed Dec 07 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.4.2-6
-- Resolves: rhbz#759647 dispose clears mpPresTimer
-
 * Tue Nov 29 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.4.2-5
 - Resolves: rhbz#757653 fix headless crash with cairo canvas