[ooo2gd] fix FTBFS
David Tardon
dtardon at fedoraproject.org
Wed Jul 25 07:59:47 UTC 2012
commit 1c68cf0a73aa03fd5d6a8d4680ba2ed483b528de
Author: David Tardon <dtardon at redhat.com>
Date: Wed Jul 25 09:46:47 2012 +0200
fix FTBFS
ooo2gd.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/ooo2gd.spec b/ooo2gd.spec
index 4f8a10b..80b9230 100644
--- a/ooo2gd.spec
+++ b/ooo2gd.spec
@@ -4,8 +4,8 @@
Name: ooo2gd
Version: 3.0.0
-Release: 4%{?dist}
-Summary: Extension for OpenOffice.org to export documents to Google Docs
+Release: 5%{?dist}
+Summary: Extension for LibreOffice to export documents to Google Docs
Group: Applications/Productivity
License: LGPLv3+
@@ -15,9 +15,9 @@ Source0: %{name}-%{version}.tar.bz2
# generated from netbeans and postprocessed by hand
Source1: nbproject.tar.bz2
-BuildRequires: ant, gdata-java, javamail, libreoffice-sdk, swing-layout
+BuildRequires: ant, gdata-java, javamail, libreoffice-sdk >= 1:3.6.0.0, swing-layout
Requires: gdata-java, guava, javamail, swing-layout
-Requires: libreoffice-core >= 1:3.3.0
+Requires: libreoffice-core >= 1:3.6.0.0
%description
OpenOffice.org2GoogleDocs (OOo2GD) is a plugin to
@@ -51,7 +51,7 @@ ant \
-Dlibreoffice.sdk.classpath=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar \
-Doffice.program.dir=${OFFICE_PROGRAM_PATH} \
-Doo.unotypes.rdb=${OO_SDK_URE_HOME}/share/misc/types.rdb \
- -Doo.offapi.rdb=${OFFICE_BASE_PROGRAM_PATH}/offapi.rdb \
+ -Doo.offapi.rdb=${OFFICE_PROGRAM_PATH}/types/offapi.rdb \
-Doo.sdk.dir=${OO_SDK_HOME} \
-Dsdk.bin.dir=${OO_SDK_HOME}/bin \
-Dure.bin.dir=${OO_SDK_URE_BIN_DIR} \
@@ -70,6 +70,9 @@ unzip -qo -d %{buildroot}/%{extensiondir}/%{name} dist/%{name}.oxt
%changelog
+* Wed Jul 25 2012 David Tardon <dtardon at redhat.com> - 3.0.0-5
+- fix FTBFS
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list