From 232ffee5824ac23ef58a26612b2ca984fb79e81a Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 14 May 2013 16:20:12 +0200
Subject: [PATCH] new release

---
 .gitignore          |  1 +
 boost-include.patch | 11 -----------
 liborcus.spec       | 34 +++++++++++++++++++++-------------
 sources             |  2 +-
 4 files changed, 23 insertions(+), 25 deletions(-)
 delete mode 100644 boost-include.patch

diff --git a/.gitignore b/.gitignore
index ad0dda2..8bf0c36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /liborcus_0.1.0.tar.bz2
 /liborcus_0.3.0.tar.bz2
+/liborcus-0.5.1.tar.bz2
diff --git a/boost-include.patch b/boost-include.patch
deleted file mode 100644
index f3ee3c7..0000000
--- a/boost-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- liborcus_0.3.0/src/liborcus/dom_tree.cpp~	2012-11-28 13:21:10.000000000 +0100
-+++ liborcus_0.3.0/src/liborcus/dom_tree.cpp	2013-02-15 14:54:30.246271997 +0100
-@@ -34,6 +34,8 @@
- #include <iostream>
- #include <sstream>
- 
-+#include <boost/noncopyable.hpp>
-+
- using namespace std;
- 
- namespace orcus {
diff --git a/liborcus.spec b/liborcus.spec
index 3a3cc5b..4ace241 100644
--- a/liborcus.spec
+++ b/liborcus.spec
@@ -1,21 +1,20 @@
+%global apiversion 0.6
+
 Name: liborcus
-Version: 0.3.0
-Release: 5%{?dist}
+Version: 0.5.1
+Release: 1%{?dist}
 Summary: Standalone file import filter library for spreadsheet documents
 
 Group: System Environment/Libraries
 License: MIT
 URL: http://gitorious.org/orcus
-Source: http://kohei.us/files/orcus/src/%{name}_%{version}.tar.bz2
+Source: http://kohei.us/files/orcus/src/%{name}-%{version}.tar.bz2
 
 # libs
 BuildRequires: boost-devel
 BuildRequires: mdds-devel
 BuildRequires: zlib-devel
 
-# upstreamed as <https://gitorious.org/orcus/orcus/merge_requests/2#f60d6eecee72349993a392a9a63ddf3383d3b8c8-f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
-Patch1: boost-include.patch
-
 %description
 %{name} is a standalone file import filter library for spreadsheet
 documents. Currently under development are ODS, XLSX and CSV import
@@ -40,14 +39,15 @@ Tools for working with Orcus.
 
 
 %prep
-%setup -q -n %{name}_%{version}
-%patch1 -p1 -b .boost-include.patch
+%setup -q
+# FIXME: make orcus-zip-dump build
+sed -i -e '38s@orcus-zip-dump\$(EXEEXT)@@' src/Makefile.in
 
 
 %build
 # TODO spreadsheet-model requires ixion
 %configure --disable-debug --disable-static --disable-werror --with-pic \
-    --disable-spreadsheet-model --without-libzip
+    --disable-spreadsheet-model
 sed -i \
     -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
     -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
@@ -68,20 +68,28 @@ rm -f %{buildroot}/%{_libdir}/*.la
 
 %files
 %doc AUTHORS
-%{_libdir}/%{name}-0.4.so.*
+%{_libdir}/%{name}-%{apiversion}.so.*
+%{_libdir}/%{name}-mso-%{apiversion}.so.*
+%{_libdir}/%{name}-parser-%{apiversion}.so.*
 
 
 %files devel
-%{_includedir}/%{name}-0.4
-%{_libdir}/%{name}-0.4.so
-%{_libdir}/pkgconfig/%{name}-0.4.pc
+%{_includedir}/%{name}-%{apiversion}
+%{_libdir}/%{name}-%{apiversion}.so
+%{_libdir}/%{name}-mso-%{apiversion}.so
+%{_libdir}/%{name}-parser-%{apiversion}.so
+%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
 
 
 %files tools
+%{_bindir}/orcus-mso-encryption
 %{_bindir}/orcus-xml-dump
 
 
 %changelog
+* Mon May 06 2013 David Tardon <dtardon@redhat.com> - 0.5.1-1
+- new release
+
 * Fri Feb 15 2013 Stephan Bergmannn <sbergman@redhat.com> - 0.3.0-5
 - missing boost include
 
diff --git a/sources b/sources
index 58439a4..0b0e73b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8755aac23317494a9028569374dc87b2  liborcus_0.3.0.tar.bz2
+ea2acaf140ae40a87a952caa75184f4d  liborcus-0.5.1.tar.bz2