diff --git a/.gitignore b/.gitignore index 9864873..8fe07e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libcdr-0.1.1.tar.xz +SOURCES/libcdr-0.1.4.tar.xz diff --git a/.libcdr.metadata b/.libcdr.metadata index cdc5fe8..39da4e9 100644 --- a/.libcdr.metadata +++ b/.libcdr.metadata @@ -1 +1 @@ -adc8cfeeed330763dbff5e933401b6a0d76b114b SOURCES/libcdr-0.1.1.tar.xz +59148610e572d1a79c4f3494a01d020944f0e1c1 SOURCES/libcdr-0.1.4.tar.xz diff --git a/SPECS/libcdr.spec b/SPECS/libcdr.spec index 72f1fae..b2fc924 100644 --- a/SPECS/libcdr.spec +++ b/SPECS/libcdr.spec @@ -1,7 +1,7 @@ %global apiversion 0.1 Name: libcdr -Version: 0.1.1 +Version: 0.1.4 Release: 1%{?dist} Summary: A library for import of CorelDRAW drawings @@ -13,6 +13,7 @@ Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: help2man +BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(librevenge-0.0) @@ -50,20 +51,12 @@ Currently supported: XHTML, text, raw. %setup -q %build -%configure --disable-static --disable-werror +%configure --disable-silent-rules --disable-static --disable-werror 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} V=1 - -export LD_LIBRARY_PATH=`pwd`/src/lib/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -help2man -N -n 'debug the conversion library' -o cdr2raw.1 ./src/conv/raw/.libs/cdr2raw -help2man -N -n 'convert CorelDRAW document into HTML' -o cdr2xhtml.1 ./src/conv/svg/.libs/cdr2xhtml -help2man -N -n 'convert CorelDRAW document into plain text' -o cdr2text.1 ./src/conv/text/.libs/cdr2text -help2man -N -n 'debug the conversion library' -o cmx2raw.1 ./src/conv/raw/.libs/cmx2raw -help2man -N -n 'convert Corel Presentation Exchange file into HTML' -o cmx2xhtml.1 ./src/conv/svg/.libs/cmx2xhtml -help2man -N -n 'convert Corel Presentation Exchange file into plain text' -o cmx2text.1 ./src/conv/text/.libs/cmx2text +make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} @@ -71,14 +64,24 @@ rm -f %{buildroot}/%{_libdir}/*.la # rhbz#1001251 we install API docs directly from build rm -rf %{buildroot}/%{_docdir}/%{name} +# generate and install man pages +export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +for tool in cdr2raw cmx2raw cdr2xhtml cmx2xhtml cdr2text cmx2text; do + help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} +done mkdir -p %{buildroot}/%{_mandir}/man1 install -m 0644 cdr2*.1 cmx2*.1 %{buildroot}/%{_mandir}/man1 %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%check +export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +make %{?_smp_mflags} check + %files -%doc AUTHORS ChangeLog COPYING.MPL README +%doc AUTHORS ChangeLog README +%license COPYING.MPL %{_libdir}/%{name}-%{apiversion}.so.* %files devel @@ -88,7 +91,7 @@ install -m 0644 cdr2*.1 cmx2*.1 %{buildroot}/%{_mandir}/man1 %{_libdir}/pkgconfig/%{name}-%{apiversion}.pc %files doc -%doc COPYING.MPL +%license COPYING.MPL %doc docs/doxygen/html %files tools @@ -106,6 +109,9 @@ install -m 0644 cdr2*.1 cmx2*.1 %{buildroot}/%{_mandir}/man1 %{_mandir}/man1/cmx2xhtml.1* %changelog +* Sun Sep 17 2017 David Tardon - 0.1.4-1 +- Resolves: rhbz#1477221 rebase to 0.1.4 + * Fri Apr 17 2015 David Tardon - 0.1.1-1 - Resolves: rhbz#1207750 rebase to 0.1.1