[libreoffice/f20] take two on building on RHEL-6

Caolán McNamara caolanm at fedoraproject.org
Fri Jan 24 17:22:11 UTC 2014


commit f6c38ec75e393713386017ad4c78d8bc29ee2061
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 24 17:22:27 2014 +0000

    take two on building on RHEL-6

 0001-update-libmwaw-to-0.2.0.patch |   17 ++++++++++++++---
 libreoffice.spec                   |    2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/0001-update-libmwaw-to-0.2.0.patch b/0001-update-libmwaw-to-0.2.0.patch
index 2be40b8..7241b96 100644
--- a/0001-update-libmwaw-to-0.2.0.patch
+++ b/0001-update-libmwaw-to-0.2.0.patch
@@ -997,6 +997,17 @@ index ff4d7af..11d6cd8 100644
                  sTypeName = "writer_ZWrite";
                  break;
              default:
--- 
-1.8.3.1
-
+--- a/libmwaw/ExternalPackage_libmwaw.mk	2014-01-24 17:19:41.059135146 +0000
++++ b/libmwaw/ExternalPackage_libmwaw.mk	2014-01-24 17:19:52.622271975 +0000
+@@ -12,9 +12,9 @@
+ $(eval $(call gb_ExternalPackage_use_external_project,libmwaw,libmwaw))
+ 
+ ifeq ($(OS)$(COM),WNTMSC)
+-$(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/mwaw-0.1.lib,src/lib/.libs/libmwaw-0.1.lib))
++$(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/mwaw-0.2.lib,src/lib/.libs/libmwaw-0.2.lib))
+ else
+-$(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/libmwaw-0.1.a,src/lib/.libs/libmwaw-0.1.a))
++$(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/libmwaw-0.2.a,src/lib/.libs/libmwaw-0.2.a))
+ endif
+ 
+ 
diff --git a/libreoffice.spec b/libreoffice.spec
index 9a2a61e..181e819 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -82,7 +82,7 @@ Source27:       %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.
 Source28:       %{external_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 Source29:       %{external_url}/c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2
 Source30:       %{external_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
-Source31:       %{external_url}/libmwaw-0.1.11.tar.bz2
+Source31:       %{external_url}/libmwaw-0.2.0.tar.bz2
 %endif
 
 # build tools


More information about the scm-commits mailing list