[liborcus] new upstream release 0.7.0
David Tardon
dtardon at fedoraproject.org
Thu May 22 15:05:33 UTC 2014
commit 0c672c8510c3994227c8132e051a34184ca89bef
Author: David Tardon <dtardon at redhat.com>
Date: Thu May 22 11:55:30 2014 +0200
new upstream release 0.7.0
.gitignore | 1 +
add-aarch64.patch | 13 -------------
add-ppc64le.patch | 12 ------------
liborcus.spec | 29 ++++++++++++-----------------
sources | 2 +-
5 files changed, 14 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8bf0c36..cb65619 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/liborcus_0.1.0.tar.bz2
/liborcus_0.3.0.tar.bz2
/liborcus-0.5.1.tar.bz2
+/liborcus-0.7.0.tar.bz2
diff --git a/liborcus.spec b/liborcus.spec
index 154deaa..034af9c 100644
--- a/liborcus.spec
+++ b/liborcus.spec
@@ -1,21 +1,20 @@
-%global apiversion 0.6
+%global apiversion 0.8
Name: liborcus
-Version: 0.5.1
-Release: 7%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
Summary: Standalone file import filter library for spreadsheet documents
Group: System Environment/Libraries
-License: MIT
+License: MPLv2.0
URL: http://gitorious.org/orcus
Source: http://kohei.us/files/orcus/src/%{name}-%{version}.tar.bz2
BuildRequires: boost-devel
+BuildRequires: chrpath
+BuildRequires: pkgconfig(mdds)
BuildRequires: pkgconfig(zlib)
-Patch0: add-aarch64.patch
-Patch1: add-ppc64le.patch
-
%description
%{name} is a standalone file import filter library for spreadsheet
documents. Currently under development are ODS, XLSX and CSV import
@@ -41,16 +40,6 @@ Tools for working with %{name}.
%prep
%autosetup -p1
-# fix build of orcus-zip-dump
-sed -i -e 's/orcus_zip_dump_LDADD = /& $(BOOST_SYSTEM_LIB) /' \
- src/Makefile.in
-# TODO: upstream the changes
-sed -i \
- -e 's/[a-z_]*_test_LDADD = /& $(BOOST_SYSTEM_LIB) /' \
- -e 's/parser_test_[a-z_]*_LDADD = /& $(BOOST_SYSTEM_LIB) /' \
- -e 's/liborcus_test_xml_structure_tree_LDADD = /& $(BOOST_SYSTEM_LIB) /' \
- src/liborcus/Makefile.in src/parser/Makefile.in
-
%build
# TODO spreadsheet-model requires ixion
%configure --disable-debug --disable-silent-rules --disable-static \
@@ -65,6 +54,8 @@ make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
rm -f %{buildroot}/%{_libdir}/*.la
+# because boost.m4 is total crap and adds RPATH unconditionally
+chrpath -d %{buildroot}/%{_libdir}/*.so
%check
export LD_LIBRARY_PATH=`pwd`/src/liborcus/.libs:`pwd`/src/parser/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
@@ -87,11 +78,15 @@ make check %{?_smp_mflags}
%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
%files tools
+%{_bindir}/orcus-detect
%{_bindir}/orcus-mso-encryption
%{_bindir}/orcus-xml-dump
%{_bindir}/orcus-zip-dump
%changelog
+* Thu May 22 2014 David Tardon <dtardon at redhat.com> - 0.7.0-1
+- new upstream release
+
* Mon May 05 2014 Jaromir Capik <jcapik at redhat.com> - 0.5.1-7
- add support for ppc64le
diff --git a/sources b/sources
index 0b0e73b..e104bd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea2acaf140ae40a87a952caa75184f4d liborcus-0.5.1.tar.bz2
+7681383be6ce489d84c1c74f4e7f9643 liborcus-0.7.0.tar.bz2
More information about the scm-commits
mailing list