dtardon pushed to liborcus (master). "make conv. tools conditional"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 16 18:43:30 UTC 2015
>From 3c2dd8a20f1a4546f6e1ec1c9830ffdbaf2401c2 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Thu, 16 Apr 2015 20:43:07 +0200
Subject: make conv. tools conditional
diff --git a/liborcus.spec b/liborcus.spec
index e3cc998..15b3142 100644
--- a/liborcus.spec
+++ b/liborcus.spec
@@ -1,5 +1,8 @@
%global apiversion 0.8
+# build conversion tools
+%bcond_without convtools
+
Name: liborcus
Version: 0.7.1
Release: 2%{?dist}
@@ -11,8 +14,10 @@ Source: http://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz
Patch0: liborcus-0.7.0-iostream.patch
BuildRequires: boost-devel
+%if %{with convtools}
BuildRequires: help2man
BuildRequires: pkgconfig(libixion-0.10)
+%endif
BuildRequires: pkgconfig(mdds) >= 0.12.0
BuildRequires: pkgconfig(zlib)
@@ -21,6 +26,7 @@ BuildRequires: pkgconfig(zlib)
documents. Currently under development are ODS, XLSX and CSV import
filters.
+%if %{with convtools}
%package model
Summary: Spreadsheet model for %{name} conversion tools
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -28,6 +34,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description model
The %{name}-model package contains a spreadsheet model used by the
conversion tools.
+%endif
%package devel
Summary: Development files for %{name}
@@ -48,15 +55,20 @@ and text.
%prep
%autosetup -p1
+%if %{without convtools}
+%global condopts --disable-spreadsheet-model
+%endif
+
%build
%configure --disable-debug --disable-silent-rules --disable-static \
- --disable-werror --with-pic
+ --disable-werror --with-pic %{?condopts}
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' \
libtool
make %{?_smp_mflags}
+%if %{with convtools}
export LD_LIBRARY_PATH=`pwd`/src/liborcus/.libs:`pwd`/src/parser/.libs:`pwd`/src/spreadsheet/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
help2man -N -n 'convert a CSV file' -o orcus-csv.1 ./src/.libs/orcus-csv
help2man -N -n 'convert a Gnumeric file' -o orcus-gnumeric.1 ./src/.libs/orcus-gnumeric
@@ -64,13 +76,16 @@ help2man -N -n 'convert an ODF spreadsheet' -o orcus-ods.1 ./src/.libs/orcus-ods
help2man -N -n 'transform an XML file' -o orcus-xls-xml.1 ./src/.libs/orcus-xls-xml
help2man -N -n 'convert a OpenXML spreadsheet' -o orcus-xlsx.1 ./src/.libs/orcus-xlsx
help2man -N -n 'convert an XML file' -o orcus-xml.1 ./src/.libs/orcus-xml
+%endif
%install
make install DESTDIR=%{buildroot}
rm -f %{buildroot}/%{_libdir}/*.la
+%if %{with convtools}
install -m 0755 -d %{buildroot}/%{_mandir}/man1
install -p -m 0644 orcus-*.1 %{buildroot}/%{_mandir}/man1
+%endif
%check
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
@@ -79,8 +94,10 @@ make check %{?_smp_mflags}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%if %{with convtools}
%post model -p /sbin/ldconfig
%postun model -p /sbin/ldconfig
+%endif
%files
%doc AUTHORS COPYING README
@@ -88,35 +105,41 @@ make check %{?_smp_mflags}
%{_libdir}/%{name}-mso-%{apiversion}.so.*
%{_libdir}/%{name}-parser-%{apiversion}.so.*
+%if %{with convtools}
%files model
%{_libdir}/%{name}-spreadsheet-model-%{apiversion}.so.*
+%endif
%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
+%if %{with convtools}
+%{_libdir}/%{name}-spreadsheet-model-%{apiversion}.so
%{_libdir}/pkgconfig/%{name}-spreadsheet-model-%{apiversion}.pc
+%endif
%files tools
-%{_bindir}/orcus-csv
%{_bindir}/orcus-detect
-%{_bindir}/orcus-gnumeric
%{_bindir}/orcus-mso-encryption
+%{_bindir}/orcus-xml-dump
+%{_bindir}/orcus-zip-dump
+%if %{with convtools}
+%{_bindir}/orcus-csv
+%{_bindir}/orcus-gnumeric
%{_bindir}/orcus-ods
%{_bindir}/orcus-xls-xml
%{_bindir}/orcus-xlsx
%{_bindir}/orcus-xml
-%{_bindir}/orcus-xml-dump
-%{_bindir}/orcus-zip-dump
%{_mandir}/man1/orcus-csv.1*
%{_mandir}/man1/orcus-gnumeric.1*
%{_mandir}/man1/orcus-ods.1*
%{_mandir}/man1/orcus-xls-xml.1*
%{_mandir}/man1/orcus-xlsx.1*
%{_mandir}/man1/orcus-xml.1*
+%endif
%changelog
* Tue Apr 14 2015 David Tardon <dtardon at redhat.com> - 0.7.1-2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/liborcus.git/commit/?h=master&id=3c2dd8a20f1a4546f6e1ec1c9830ffdbaf2401c2
More information about the scm-commits
mailing list