[libreoffice/f16] Resolves: rhbz#807243 require correct version of hsqldb

Caolán McNamara caolanm at fedoraproject.org
Tue Mar 27 11:58:35 UTC 2012


commit f71af69aa3f8eff6f9b01656bbca1dad0de16456
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 27 12:58:27 2012 +0100

    Resolves: rhbz#807243 require correct version of hsqldb

 libreoffice.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 4cc9887..eca34e1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -33,7 +33,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain and ASL 2.0 and Artistic
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -318,6 +318,9 @@ to be written in python.
 Summary: Database front-end for LibreOffice
 Group: Applications/Productivity
 Requires: postgresql-jdbc
+%if %{defined rhel} && 0%{?rhel} < 7
+Requires:  hsqldb
+%endif
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-calc = %{epoch}:%{version}-%{release}
@@ -2489,9 +2492,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Mon Mar 26 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-9.UNBUILT
+* Tue Mar 27 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-10
 - Resolves: rhbz#789022 SwNodes: fix inconsistent outline check
 - Resolves: rhbz#806663 SlideshowImpl can outlive SdModule
+- Resolves: rhbz#807243 require correct version of hsqldb
 
 * Tue Mar 06 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-8
 - Resolves: fdo#31966 do not create an empty slide when printing handouts


More information about the scm-commits mailing list