X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=cppunit.spec;h=8027fb611a009b24de81341df28522d9cc954fb9;hb=HEAD;hp=cf4ccf0cf00bd2daacff21f6dd33598fa1cf6a63;hpb=d1923c9354f06d866b337ba747371b6d599d062b;p=packages%2Fcppunit.git

diff --git a/cppunit.spec b/cppunit.spec
index cf4ccf0..14ad7b3 100644
--- a/cppunit.spec
+++ b/cppunit.spec
@@ -1,17 +1,17 @@
 Summary:	The C++ Unit Test Library
 Summary(pl.UTF-8):	Biblioteka testowa do C++
 Name:		cppunit
-Version:	1.12.0
-Release:	2
+Version:	1.15.1
+Release:	1
 License:	LGPL
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/cppunit/%{name}-%{version}.tar.gz
-# Source0-md5:	7493718733ded49a96cf763c5d3eea7f
-URL:		http://cppunit.sourceforge.net/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake >= 1.4
+Source0:	http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz
+# Source0-md5:	9dc669e6145cadd9674873e24943e6dd
+URL:		https://www.freedesktop.org/wiki/Software/cppunit/
+BuildRequires:	autoconf >= 2.65
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	doxygen
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libtool >= 2:1.4d
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -27,7 +27,7 @@ Summary:	cppunit header files
 Summary(pl.UTF-8):	Pliki nagłówkowe cppunit
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libstdc++-devel
+Requires:	libstdc++-devel >= 6:4.7
 
 %description devel
 cppunit header files.
@@ -47,18 +47,29 @@ cppunit static library.
 %description static -l pl.UTF-8
 Statyczna biblioteka cppunit.
 
+%package apidocs
+Summary:	cppunit API documentation
+Summary(pl.UTF-8):	Dokumentacja API cppunit
+Group:		Documentation
+BuildArch:	noarch
+
+%description apidocs
+cppunit API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API cppunit.
+
 %prep
 %setup -q
 
-echo 'libcppunit_la_LIBADD = -ldl' >> src/cppunit/Makefile.am
-
 %build
 %{__libtoolize}
 %{__aclocal} -I config
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--disable-silent-rules
 %{__make}
 
 %install
@@ -67,8 +78,12 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_includedir}/cppunit/{ui/mfc,ui/qt,config/config-[bm]*}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcppunit.la
+# non-Linux
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/cppunit/config/config-{bcb5,evc4,mac,msvc6}.h
+# packaged as %doc in -apidocs
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/cppunit/html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,19 +95,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS NEWS README THANKS TODO
 %attr(755,root,root) %{_bindir}/DllPlugInTester
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libcppunit-1.15.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcppunit-1.15.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/FAQ doc/html
-%attr(755,root,root) %{_bindir}/cppunit-config
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%doc doc/FAQ
+%attr(755,root,root) %{_libdir}/libcppunit.so
 %{_includedir}/cppunit
-%{_aclocaldir}/cppunit.m4
 %{_pkgconfigdir}/cppunit.pc
-%{_mandir}/man1/cppunit-config.1*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libcppunit.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/html/*