From e7ce0205fb0fc9d5f341ef86ecc51af5e5af3707 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 14 Feb 2016 20:34:59 +0100 Subject: [PATCH] switch to mdds 1.x --- libetonyek.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/libetonyek.spec b/libetonyek.spec index f9c496d..96881d9 100644 --- a/libetonyek.spec +++ b/libetonyek.spec @@ -2,7 +2,7 @@ Name: libetonyek Version: 0.1.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A library for import of Apple iWork documents License: MPLv2.0 @@ -18,7 +18,11 @@ BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(libxml-2.0) +%if 0%{?fedora} >= 24 +BuildRequires: pkgconfig(mdds-1.0) +%else BuildRequires: pkgconfig(mdds) +%endif BuildRequires: pkgconfig(zlib) %description @@ -54,7 +58,13 @@ supported: CSV, HTML, SVG, text, and raw. %autosetup -p1 %build -%configure --disable-silent-rules --disable-static --disable-werror --with-mdds=0.x +%if 0%{?fedora} >= 24 +%global distrooptions %{nil} +%else +%global distrooptions --with-mdds=0.x +%endif + +%configure --disable-silent-rules --disable-static --disable-werror %{distrooptions} 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' \ @@ -118,6 +128,9 @@ make %{?_smp_mflags} check %{_mandir}/man1/pages2text.1* %changelog +* Sun Feb 14 2016 David Tardon - 0.1.6-4 +- switch to mdds 1.x + * Thu Feb 04 2016 Fedora Release Engineering - 0.1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild