- Use verbose build, disable werror, drop conditional for docs.

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libwpg?expand=0&rev=6
This commit is contained in:
Tomáš Chvátal 2013-11-01 09:35:35 +00:00 committed by Git OBS Bridge
parent 1ebb598a52
commit fb90e6c5b6
2 changed files with 14 additions and 18 deletions

View File

@ -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 Fri Apr 19 07:07:14 UTC 2013 - fridrich.strba@suse.com

View File

@ -17,13 +17,7 @@
Name: libwpg 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 BuildRequires: doxygen
%else
%define build_doc 0
%endif
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libwpd-devel >= 0.9.0 BuildRequires: libwpd-devel >= 0.9.0
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -68,8 +62,6 @@ on Microsoft Windows and Linux.
This package contains the libwpg development files. This package contains the libwpg development files.
%if %build_doc
%package devel-doc %package devel-doc
Summary: Documentation for the libwpg API Summary: Documentation for the libwpg API
Group: Documentation/HTML Group: Documentation/HTML
@ -77,8 +69,6 @@ Group: Documentation/HTML
%description devel-doc %description devel-doc
This package contains documentation for the libwpg API. This package contains documentation for the libwpg API.
%endif
%package tools %package tools
Summary: Tools for converting WordPerfect Graphics files Summary: Tools for converting WordPerfect Graphics files
Group: Productivity/Publishing/Word Group: Productivity/Publishing/Word
@ -91,15 +81,18 @@ Tools to work with graphics in WPG (WordPerfect Graphics) format.
%build %build
export CXXFLAGS="%optflags -fvisibility-inlines-hidden" export CXXFLAGS="%optflags -fvisibility-inlines-hidden"
%configure --disable-static --docdir=%_docdir/%name %configure \
make %{?_smp_mflags} --disable-werror \
--disable-static \
--docdir=%_docdir/%name
make %{?_smp_mflags} V=1
%install %install
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=%{buildroot} install
rm $RPM_BUILD_ROOT%_libdir/*.la rm %{buildroot}%_libdir/*.la
# documentation # documentation
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} mkdir -p %{buildroot}%{_docdir}/%{name}
cp -p AUTHORS COPYING.LGPL COPYING.MPL ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name} cp -p AUTHORS COPYING.LGPL COPYING.MPL ChangeLog %{buildroot}%{_docdir}/%{name}
%post -n %libname -p /sbin/ldconfig %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}/*.so
%{_libdir}/pkgconfig/libwpg*.pc %{_libdir}/pkgconfig/libwpg*.pc
%{_includedir}/libwpg-* %{_includedir}/libwpg-*
%if %build_doc != 0
%files devel-doc %files devel-doc
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc %{_docdir}/%{name}/html %doc %{_docdir}/%{name}/html
%endif
%files tools %files tools
%defattr(-,root,root) %defattr(-,root,root)