[libreoffice/master-3.5] build CDR import support

David Tardon dtardon at fedoraproject.org
Tue Dec 13 13:38:30 UTC 2011


commit 9d1c9cabb418f088350da41b320623e281c5d3f2
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 13 12:00:43 2011 +0100

    build CDR import support

 .gitignore       |    1 +
 libreoffice.spec |    3 +++
 sources          |    1 +
 3 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06cd1ca..77742b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@
 /libreoffice-binfilter-3.4.99.1.tar.bz2
 /libreoffice-help-3.4.99.1.tar.bz2
 /libreoffice-translations-3.4.99.1.tar.bz2
+/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
diff --git a/libreoffice.spec b/libreoffice.spec
index 60d92c5..8977a73 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -61,6 +61,7 @@ Source19:       http://dev-www.libreoffice.org/src/e1c178b18f130b40494561f02bc1a
 Source20:       http://dev-www.libreoffice.org/src/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
 # TODO: IIRC mysql-connector-cpp is in Fedora. Is it usable?
 Source21:       http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
+Source22:       http://dev-www.libreoffice.org/src/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
 
 BuildRequires:  zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
 BuildRequires:  binutils, java-devel < 1:1.7.0, boost-devel, zlib-devel
@@ -841,6 +842,7 @@ cp %{SOURCE18} ext_sources
 cp %{SOURCE19} ext_sources
 cp %{SOURCE20} ext_sources
 cp %{SOURCE21} ext_sources
+cp %{SOURCE22} ext_sources
 touch src.downloaded
 
 . ./Env.Host.sh
@@ -1942,6 +1944,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %defattr(-,root,root,-)
 %dir %{baseinstdir}
 %dir %{baseinstdir}/program
+%{baseinstdir}/program/libcdrimport%{SOPOST}.so
 %{baseinstdir}/program/libflash%{SOPOST}.so
 %{baseinstdir}/program/libsvgfilter%{SOPOST}.so
 %{baseinstdir}/share/registry/graphicfilter.xcd
diff --git a/sources b/sources
index ac0e258..5136f5c 100644
--- a/sources
+++ b/sources
@@ -11,6 +11,7 @@ e1c178b18f130b40494561f02bc1a948  e1c178b18f130b40494561f02bc1a948-libexttextcat
 379ddf3008e76f338e0973adc375340d  libreoffice-help-3.4.99.1.tar.bz2
 7c2549f6b0a8bb604e6c4c729ffdcfe6  7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
 0981bda6548a8c8233ffce2b6e4b2a23  0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
+cc8eb870d6a324d36575420efd856319  cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
 f08b4a6ec456e8c4f1e06acf51d1def4  libreoffice-translations-3.4.99.1.tar.bz2
 185d60944ea767075d27247c3162b3bc  185d60944ea767075d27247c3162b3bc-unowinreg.dll
 c1b5b8d1dd929a1261a6f8872d92b799  redhat-langpacks.tar.gz


More information about the scm-commits mailing list