commit d4854844ffec817be0a9edc2e885686756692eee Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Tue Aug 30 16:12:43 2016 +0200
- updated to 0.12.0 (note: new library names, API 0.12; uses ixion 0.12) - added flags patch liborcus-flags.patch | 13 ++++++++++++ liborcus.spec | 57 +++++++++++++++++++++++++++------------------------- 2 files changed, 43 insertions(+), 27 deletions(-) --- diff --git a/liborcus.spec b/liborcus.spec index d3f0b10..a530ae9 100644 --- a/liborcus.spec +++ b/liborcus.spec @@ -7,21 +7,22 @@ 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.11.2 +Version: 0.12.0 Release: 1 -License: MIT +License: MPL v2.0 Group: Libraries #Source0Download: https://gitlab.com/orcus/orcus Source0: http://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz -# Source0-md5: 9f5a0b03853cfd4f3748b176c0ef5d0f +# Source0-md5: b218c61c2ef219c6629954e7628d0770 +Patch0: %{name}-flags.patch URL: https://gitlab.com/orcus/orcus BuildRequires: autoconf >= 2.65 BuildRequires: automake >= 1:1.11 BuildRequires: boost-devel >= 1.36 -%{?with_ixion:BuildRequires: ixion-devel >= 0.11} +%{?with_ixion:BuildRequires: ixion-devel >= 0.12.0} BuildRequires: libstdc++-devel >= 6:4.7 BuildRequires: libtool >= 2:1.5 -BuildRequires: mdds-devel >= 1.2.0 +BuildRequires: mdds-devel >= 1.2.1 BuildRequires: pkgconfig >= 1:0.20 %{?with_python:BuildRequires: python3-devel >= 1:3.2} BuildRequires: tar >= 1:1.22 @@ -72,7 +73,7 @@ Summary: liborcus spreadsheet model library Summary(pl.UTF-8): Biblioteka liborcus spreadsheet model Group: Libraries Requires: %{name} = %{version}-%{release} -Requires: ixion >= 0.11 +Requires: ixion >= 0.12.0 %description spreadsheet liborcus spreadsheet model library. @@ -86,7 +87,7 @@ Summary(pl.UTF-8): Pliki programistyczne biblioteki liborcus spreadsheet model Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-spreadsheet = %{version}-%{release} -Requires: ixion-devel >= 0.11 +Requires: ixion-devel >= 0.12.0 %description spreadsheet-devel Development files for liborcus spreadsheet model library. @@ -121,6 +122,7 @@ Wiązanie Pythona 3 do biblioteki liborcus. %prep %setup -q +%patch0 -p1 %build %{__libtoolize} @@ -129,6 +131,7 @@ Wiązanie Pythona 3 do biblioteki liborcus. %{__autoheader} %{__automake} %configure \ + am_cv_python_pyexecdir=%{py3_sitedir} \ am_cv_python_pythondir=%{py3_sitescriptdir} \ --disable-debug \ %{!?with_python:--disable-python} \ @@ -168,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS +%doc AUTHORS CHANGELOG ChangeLog LICENSE README.md %attr(755,root,root) %{_bindir}/orcus-css-dump %attr(755,root,root) %{_bindir}/orcus-detect %attr(755,root,root) %{_bindir}/orcus-json @@ -176,27 +179,27 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/orcus-xml-dump %attr(755,root,root) %{_bindir}/orcus-yaml %attr(755,root,root) %{_bindir}/orcus-zip-dump -%attr(755,root,root) %{_libdir}/liborcus-0.11.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liborcus-0.11.so.0 -%attr(755,root,root) %{_libdir}/liborcus-mso-0.11.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liborcus-mso-0.11.so.0 -%attr(755,root,root) %{_libdir}/liborcus-parser-0.11.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liborcus-parser-0.11.so.0 +%attr(755,root,root) %{_libdir}/liborcus-0.12.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liborcus-0.12.so.0 +%attr(755,root,root) %{_libdir}/liborcus-mso-0.12.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liborcus-mso-0.12.so.0 +%attr(755,root,root) %{_libdir}/liborcus-parser-0.12.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liborcus-parser-0.12.so.0 %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/liborcus-0.11.so -%attr(755,root,root) %{_libdir}/liborcus-mso-0.11.so -%attr(755,root,root) %{_libdir}/liborcus-parser-0.11.so -%{_includedir}/liborcus-0.11 -%{_pkgconfigdir}/liborcus-0.11.pc +%attr(755,root,root) %{_libdir}/liborcus-0.12.so +%attr(755,root,root) %{_libdir}/liborcus-mso-0.12.so +%attr(755,root,root) %{_libdir}/liborcus-parser-0.12.so +%{_includedir}/liborcus-0.12 +%{_pkgconfigdir}/liborcus-0.12.pc %if %{with static_libs} %files static %defattr(644,root,root,755) -%{_libdir}/liborcus-0.11.a -%{_libdir}/liborcus-mso-0.11.a -%{_libdir}/liborcus-parser-0.11.a +%{_libdir}/liborcus-0.12.a +%{_libdir}/liborcus-mso-0.12.a +%{_libdir}/liborcus-parser-0.12.a %endif %if %{with ixion} @@ -208,17 +211,17 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/orcus-xls-xml %attr(755,root,root) %{_bindir}/orcus-xlsx %attr(755,root,root) %{_bindir}/orcus-xml -%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.11.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.11.so.0 +%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.12.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.12.so.0 %files spreadsheet-devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.11.so -%{_pkgconfigdir}/liborcus-spreadsheet-model-0.11.pc +%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.12.so +%{_pkgconfigdir}/liborcus-spreadsheet-model-0.12.pc %files spreadsheet-static %defattr(644,root,root,755) -%{_libdir}/liborcus-spreadsheet-model-0.11.a +%{_libdir}/liborcus-spreadsheet-model-0.12.a %endif %if %{with python} diff --git a/liborcus-flags.patch b/liborcus-flags.patch new file mode 100644 index 0000000..26a50e5 --- /dev/null +++ b/liborcus-flags.patch @@ -0,0 +1,13 @@ +--- liborcus-0.12.0/configure.ac.orig 2016-08-20 20:49:07.000000000 +0200 ++++ liborcus-0.12.0/configure.ac 2016-08-30 15:53:13.932267671 +0200 +@@ -112,9 +112,8 @@ + [enable_debug=no] + ) + AS_IF([test "x$enable_debug" != "xno"], [ +- CXXFLAGS="$CXXFLAGS -g -O0 -DMDDS_ASSERT_STRING_MAP" ++ CXXFLAGS="$CXXFLAGS -g -DMDDS_ASSERT_STRING_MAP" + ], [ +- CXXFLAGS="$CXXFLAGS -O2" + AC_DEFINE([NDEBUG], [], [Disable debugging information]) + ]) + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/liborcus.git/commitdiff/d4854844ffec817be0a9edc2e885686756692eee _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit