From 877fc2914fbe90cc665f8f5685d3743d79d16935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 20 Nov 2014 10:43:09 +0000 Subject: [PATCH] Resolves: rhbz#1164551 we just want libjvm.so to be available --- libreoffice.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 0b9620b..2ced4db 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,7 +46,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 4%{?libo_prerelease}%{?dist} +Release: 5%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0 Group: Applications/Productivity URL: http://www.libreoffice.org/ @@ -763,7 +763,11 @@ creation and management of PostgreSQL databases through a GUI. %package ure Summary: UNO Runtime Environment Group: Development/Libraries -Requires: unzip, jre-headless >= 1.5.0 +#rhbz#1164551 we want to ensure that a libjvm.so of this arch is available +%if %{__isa_bits} == 64 +%global mark64 ()(64bit) +%endif +Requires: unzip, libjvm.so%{?mark64} Obsoletes: openoffice.org-ure < 1:3.3.1 %if 0%{?rhel} && 0%{?rhel} < 7 Provides: openoffice.org-ure = 1:3.3.0 @@ -2314,6 +2318,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Thi Nov 20 2014 Caolán McNamara - 1:4.3.4.1-5 +- Resolves: rhbz#1164551 we want to ensure that a libjvm.so is available + but we have no firm interest in which one that is + * Wed Nov 19 2014 Caolán McNamara - 1:4.3.4.1-4 - Resolves: rhbz#1165740 arbitrarily backport some rtf crash fixes