diff --git a/libwpg.changes b/libwpg.changes index 7f7925b..bf8a1be 100644 --- a/libwpg.changes +++ b/libwpg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 1 09:35:52 UTC 2013 - tchvatal@suse.com + +- Use verbose build, disable werror, drop conditional for docs. + ------------------------------------------------------------------- Fri Apr 19 07:07:14 UTC 2013 - fridrich.strba@suse.com diff --git a/libwpg.spec b/libwpg.spec index eccd559..a5bb225 100644 --- a/libwpg.spec +++ b/libwpg.spec @@ -17,13 +17,7 @@ Name: libwpg -# note: the main package is empty, it only sets a sane name for the source rpm -%if 0%{?suse_version} > 1020 -%define build_doc 1 BuildRequires: doxygen -%else -%define build_doc 0 -%endif BuildRequires: gcc-c++ BuildRequires: libwpd-devel >= 0.9.0 BuildRequires: pkgconfig @@ -68,8 +62,6 @@ on Microsoft Windows and Linux. This package contains the libwpg development files. -%if %build_doc - %package devel-doc Summary: Documentation for the libwpg API Group: Documentation/HTML @@ -77,8 +69,6 @@ Group: Documentation/HTML %description devel-doc This package contains documentation for the libwpg API. -%endif - %package tools Summary: Tools for converting WordPerfect Graphics files Group: Productivity/Publishing/Word @@ -91,15 +81,18 @@ Tools to work with graphics in WPG (WordPerfect Graphics) format. %build export CXXFLAGS="%optflags -fvisibility-inlines-hidden" -%configure --disable-static --docdir=%_docdir/%name -make %{?_smp_mflags} +%configure \ + --disable-werror \ + --disable-static \ + --docdir=%_docdir/%name +make %{?_smp_mflags} V=1 %install -make DESTDIR=$RPM_BUILD_ROOT install -rm $RPM_BUILD_ROOT%_libdir/*.la +make DESTDIR=%{buildroot} install +rm %{buildroot}%_libdir/*.la # documentation -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} -cp -p AUTHORS COPYING.LGPL COPYING.MPL ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name} +mkdir -p %{buildroot}%{_docdir}/%{name} +cp -p AUTHORS COPYING.LGPL COPYING.MPL ChangeLog %{buildroot}%{_docdir}/%{name} %post -n %libname -p /sbin/ldconfig @@ -114,12 +107,10 @@ cp -p AUTHORS COPYING.LGPL COPYING.MPL ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{nam %{_libdir}/*.so %{_libdir}/pkgconfig/libwpg*.pc %{_includedir}/libwpg-* -%if %build_doc != 0 %files devel-doc %defattr(-,root,root,-) %doc %{_docdir}/%{name}/html -%endif %files tools %defattr(-,root,root)