diff --git a/baselibs.conf b/baselibs.conf index bfd0cef..d4bb25b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libcppunit-1_12-0 +libcppunit-1_13-0 libcppunit-devel requires -libcppunit- - requires "libcppunit-1_12-0- = " + requires "libcppunit-1_13-0- = " diff --git a/cppunit.changes b/cppunit.changes index 6b690ba..f5cad64 100644 --- a/cppunit.changes +++ b/cppunit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 12 09:51:22 UTC 2013 - tchvatal@suse.com + +- Fix baselibs.conf +- Run tests and split documentation in own devel-doc subpackage. +- Remove la file and do not build static lib. + ------------------------------------------------------------------- Mon Nov 11 23:59:56 UTC 2013 - tbehrens@suse.com diff --git a/cppunit.spec b/cppunit.spec index ec736d3..3a70390 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,7 +1,7 @@ # # spec file for package cppunit # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,16 +55,30 @@ Requires: %{libname} = %{version} This package contains all necessary include files and libraries needed to develop applications that require these. +%package devel-doc +Summary: Documentation for the cppunit API +Group: Documentation/HTML +%if 0%{?suse_version} > 1200 +BuildArch: noarch +%endif + +%description devel-doc +This package contains documentation for the cppunit API. + %prep %setup -q %build export CXXFLAGS="%{optflags}" -%configure --enable-doxygen -make %{?_smp_mflags} +%configure \ + --disable-static \ + --enable-doxygen +make %{?_smp_mflags} V=1 %install make DESTDIR=%{buildroot} install +# remove la archive +rm %{buildroot}%{_libdir}/*.la # this got also installed to _defaultdocdir rm -rf %{buildroot}%{_datadir}/cppunit/html/ find %{buildroot}%{_includedir} -type f | xargs chmod a-x @@ -73,6 +87,9 @@ mkdir -p %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ install %{SOURCE1} %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ %suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/cppunit-devel.desktop +%check +make check %{?_smp_mflags} V=1 + %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -84,17 +101,19 @@ install %{SOURCE1} %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ %{_datadir}/cppunit %files devel -%defattr(-,root,root,755) +%defattr(-,root,root) %doc NEWS README THANKS ChangeLog %{_bindir}/DllPlugInTester %{_bindir}/cppunit-config %{_libdir}/libcppunit*.so -%{_libdir}/libcppunit*a %{_libdir}/pkgconfig/cppunit.pc %{_datadir}/susehelp %{_includedir}/* %{_mandir}/*/* %{_datadir}/aclocal/cppunit.m4 + +%files devel-doc +%defattr(-,root,root) %doc doc/html/* %changelog