diff --git a/liborcus.spec b/liborcus.spec index 8e09b24..d10eb82 100644 --- a/liborcus.spec +++ b/liborcus.spec @@ -2,7 +2,7 @@ Name: liborcus Version: 0.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Standalone file import filter library for spreadsheet documents Group: System Environment/Libraries @@ -12,6 +12,7 @@ Source: http://kohei.us/files/orcus/src/%{name}-%{version}.tar.bz2 BuildRequires: boost-devel BuildRequires: chrpath +BuildRequires: pkgconfig(libixion-0.8) BuildRequires: pkgconfig(mdds) BuildRequires: pkgconfig(zlib) @@ -20,6 +21,15 @@ BuildRequires: pkgconfig(zlib) documents. Currently under development are ODS, XLSX and CSV import filters. +%package model +Summary: Spreadsheet model for %{name} conversion tools +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description model +The %{name}-model package contains a spreadsheet model used by the +conversion tools. + %package devel Summary: Development files for %{name} Group: Development/Libraries @@ -35,7 +45,8 @@ Group: Applications/Publishing Requires: %{name}%{?_isa} = %{version}-%{release} %description tools -Tools for working with %{name}. +Helper tools for %{name} and converters of various file formats to HTML +and text. %prep %autosetup -p1 @@ -43,8 +54,7 @@ Tools for working with %{name}. %build # TODO spreadsheet-model requires ixion %configure --disable-debug --disable-silent-rules --disable-static \ - --disable-werror --with-pic \ - --disable-spreadsheet-model + --disable-werror --with-pic 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' \ @@ -58,32 +68,49 @@ rm -f %{buildroot}/%{_libdir}/*.la chrpath -d %{buildroot}/%{_libdir}/*.so %check -export LD_LIBRARY_PATH=`pwd`/src/liborcus/.libs:`pwd`/src/parser/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} make check %{?_smp_mflags} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post model -p /sbin/ldconfig +%postun model -p /sbin/ldconfig + %files %doc AUTHORS COPYING README %{_libdir}/%{name}-%{apiversion}.so.* %{_libdir}/%{name}-mso-%{apiversion}.so.* %{_libdir}/%{name}-parser-%{apiversion}.so.* +%files model +%{_libdir}/%{name}-spreadsheet-model-%{apiversion}.so.* + %files devel %{_includedir}/%{name}-%{apiversion} %{_libdir}/%{name}-%{apiversion}.so %{_libdir}/%{name}-mso-%{apiversion}.so %{_libdir}/%{name}-parser-%{apiversion}.so +%{_libdir}/%{name}-spreadsheet-model-%{apiversion}.so %{_libdir}/pkgconfig/%{name}-%{apiversion}.pc +%{_libdir}/pkgconfig/%{name}-spreadsheet-model-%{apiversion}.pc %files tools +%{_bindir}/orcus-csv %{_bindir}/orcus-detect +%{_bindir}/orcus-gnumeric %{_bindir}/orcus-mso-encryption +%{_bindir}/orcus-ods +%{_bindir}/orcus-xls-xml +%{_bindir}/orcus-xlsx +%{_bindir}/orcus-xml %{_bindir}/orcus-xml-dump %{_bindir}/orcus-zip-dump %changelog +* Thu May 29 2014 David Tardon - 0.7.0-3 +- enable conversion tools + * Fri May 23 2014 Petr Machata - 0.7.0-2 - Rebuild for boost 1.55.0