[packages/liborcus] - updated to 0.5.1 (note: new library names) - updated link,am patches

qboosh qboosh at pld-linux.org
Fri Apr 26 17:23:19 CEST 2013 

commit 6cb5819df5d8109037742e6b0ee2cb34a61ea295
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Apr 26 17:23:22 2013 +0200

    - updated to 0.5.1 (note: new library names)
    - updated link,am patches

 liborcus-am.patch   |  8 ++++----
 liborcus-link.patch | 32 ++++++++++++++++++++++++++------
 liborcus.spec       | 43 +++++++++++++++++++++++++++----------------
 3 files changed, 57 insertions(+), 26 deletions(-)
---
diff --git a/liborcus.spec b/liborcus.spec
index 2fb9cd0..1c1ae3b 100644
--- a/liborcus.spec
+++ b/liborcus.spec
@@ -7,12 +7,13 @@
 Summary:	Standalone file import filter library for spreadsheet documents
 Summary(pl.UTF-8):	Biblioteka samodzielnego filtra importującego pliki dla arkuszy kalkulacyjnych
 Name:		liborcus
-Version:	0.3.0
-Release:	2
+Version:	0.5.1
+Release:	1
 License:	MIT
 Group:		Libraries
-Source0:	http://kohei.us/files/orcus/src/%{name}_%{version}.tar.bz2
-# Source0-md5:	8755aac23317494a9028569374dc87b2
+#Source0Download: http://gitorious.org/orcus/pages/Download
+Source0:	http://kohei.us/files/orcus/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	ea2acaf140ae40a87a952caa75184f4d
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-am.patch
 URL:		http://gitorious.org/orcus
@@ -106,7 +107,7 @@ Static liborcus spreadsheet model library.
 Biblioteka statyczna liborcus spreadsheet model.
 
 %prep
-%setup -q -n %{name}_%{version}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 
@@ -148,20 +149,30 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS
+%attr(755,root,root) %{_bindir}/orcus-mso-encryption
 %attr(755,root,root) %{_bindir}/orcus-xml-dump
-%attr(755,root,root) %{_libdir}/liborcus-0.4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-0.4.so.0
+%attr(755,root,root) %{_bindir}/orcus-zip-dump
+%attr(755,root,root) %{_libdir}/liborcus-0.6.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-0.6.so.0
+%attr(755,root,root) %{_libdir}/liborcus-mso-0.6.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-mso-0.6.so.0
+%attr(755,root,root) %{_libdir}/liborcus-parser-0.6.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-parser-0.6.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liborcus-0.4.so
-%{_includedir}/liborcus-0.4
-%{_pkgconfigdir}/liborcus-0.4.pc
+%attr(755,root,root) %{_libdir}/liborcus-0.6.so
+%attr(755,root,root) %{_libdir}/liborcus-mso-0.6.so
+%attr(755,root,root) %{_libdir}/liborcus-parser-0.6.so
+%{_includedir}/liborcus-0.6
+%{_pkgconfigdir}/liborcus-0.6.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/liborcus-0.4.a
+%{_libdir}/liborcus-0.6.a
+%{_libdir}/liborcus-mso-0.6.a
+%{_libdir}/liborcus-parser-0.6.a
 %endif
 
 %if %{with ixion}
@@ -172,15 +183,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/orcus-ods
 %attr(755,root,root) %{_bindir}/orcus-xlsx
 %attr(755,root,root) %{_bindir}/orcus-xml
-%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.4.so.0
+%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.6.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.6.so.0
 
 %files spreadsheet-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.4.so
-%{_pkgconfigdir}/liborcus-spreadsheet-model-0.4.pc
+%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.6.so
+%{_pkgconfigdir}/liborcus-spreadsheet-model-0.6.pc
 
 %files spreadsheet-static
 %defattr(644,root,root,755)
-%{_libdir}/liborcus-spreadsheet-model-0.4.a
+%{_libdir}/liborcus-spreadsheet-model-0.6.a
 %endif
diff --git a/liborcus-am.patch b/liborcus-am.patch
index 71217fa..24cb5aa 100644
--- a/liborcus-am.patch
+++ b/liborcus-am.patch
@@ -1,11 +1,11 @@
---- liborcus_0.3.0/configure.ac.orig	2012-11-28 13:21:10.000000000 +0100
-+++ liborcus_0.3.0/configure.ac	2013-04-01 07:14:35.052006900 +0200
+--- liborcus-0.5.1/configure.ac.orig	2013-04-25 21:45:24.494182678 +0200
++++ liborcus-0.5.1/configure.ac	2013-04-25 21:45:42.664181916 +0200
 @@ -22,7 +22,7 @@
  # =============
- AC_INIT([orcus],[orcus_version])
+ AC_INIT([liborcus],[orcus_version])
  AC_CONFIG_MACRO_DIR([m4])
 -AM_CONFIG_HEADER([config.h])
 +AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE([1.11 foreign dist-xz])
+ AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz])
  AM_SILENT_RULES([yes])
  AC_LANG([C++])
diff --git a/liborcus-link.patch b/liborcus-link.patch
index bd246bc..f27448d 100644
--- a/liborcus-link.patch
+++ b/liborcus-link.patch
@@ -1,19 +1,19 @@
---- liborcus_0.3.0/src/Makefile.am.orig	2012-11-28 13:21:10.000000000 +0100
-+++ liborcus_0.3.0/src/Makefile.am	2013-04-01 09:25:19.181843438 +0200
-@@ -22,7 +22,8 @@
- 	dom_tree_sax_handler.cpp
+--- liborcus-0.5.1/src/Makefile.am.orig	2013-03-25 01:18:18.000000000 +0100
++++ liborcus-0.5.1/src/Makefile.am	2013-04-26 15:24:37.638182274 +0200
+@@ -36,7 +36,8 @@
  
  orcus_xml_dump_LDADD = \
+ 	parser/liborcus-parser- at ORCUS_API_VERSION@.la \
 -	liborcus/liborcus- at ORCUS_API_VERSION@.la
 +	liborcus/liborcus- at ORCUS_API_VERSION@.la \
 +	-lpthread
  
  orcus_xml_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(COMMON_CPPFLAGS)
  
-@@ -78,7 +79,8 @@
- 
+@@ -110,7 +111,8 @@
  orcus_xml_LDADD = \
  	liborcus/liborcus- at ORCUS_API_VERSION@.la \
+ 	parser/liborcus-parser- at ORCUS_API_VERSION@.la \
 -	spreadsheet/liborcus-spreadsheet-model- at ORCUS_API_VERSION@.la
 +	spreadsheet/liborcus-spreadsheet-model- at ORCUS_API_VERSION@.la \
 +	-lpthread
@@ -30,3 +30,23 @@
 +liborcus_spreadsheet_model_ at ORCUS_API_VERSION@_la_LIBADD = $(LIBIXION_LIBS) $(top_builddir)/src/liborcus/liborcus- at ORCUS_API_VERSION@.la
  
  endif
+--- liborcus-0.5.1/src/parser/Makefile.am.orig	2013-04-12 16:25:03.000000000 +0200
++++ liborcus-0.5.1/src/parser/Makefile.am	2013-04-26 15:43:10.978135549 +0200
+@@ -20,6 +20,7 @@
+ 
+ liborcus_parser_ at ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined
+ liborcus_parser_ at ORCUS_API_VERSION@_la_LIBADD = \
++	$(BOOST_SYSTEM_LIB) \
+ 	 $(ZLIB_LIBS)
+ 
+ EXTRA_PROGRAMS = \
+--- liborcus-0.5.1/src/liborcus/Makefile.am.orig	2013-04-12 16:24:50.000000000 +0200
++++ liborcus-0.5.1/src/liborcus/Makefile.am	2013-04-26 16:53:18.567958975 +0200
+@@ -175,6 +175,7 @@
+ 	$(BOOST_SYSTEM_CFLAGS) $(ZLIB_CFLAGS)
+ liborcus_ at ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined
+ liborcus_ at ORCUS_API_VERSION@_la_LIBADD = \
++	$(top_builddir)/src/parser/liborcus-parser- at ORCUS_API_VERSION@.la \
+ 	 $(BOOST_SYSTEM_LIBS) $(BOOST_SYSTEM_LIB) $(ZLIB_LIBS)
+ 
+ # liborcus-test-xml-map-tree
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/liborcus.git/commitdiff/6cb5819df5d8109037742e6b0ee2cb34a61ea295

More information about the pld-cvs-commit mailing list