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

diff --git a/cppunit.spec b/cppunit.spec
index 5987322..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.13.2
+Version:	1.15.1
 Release:	1
 License:	LGPL
 Group:		Libraries
 Source0:	http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz
-# Source0-md5:	d1c6bdd5a76c66d2c38331e2d287bc01
-URL:		http://www.freedesktop.org/wiki/Software/cppunit/
+# 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.
@@ -51,6 +51,7 @@ Statyczna biblioteka cppunit.
 Summary:	cppunit API documentation
 Summary(pl.UTF-8):	Dokumentacja API cppunit
 Group:		Documentation
+BuildArch:	noarch
 
 %description apidocs
 cppunit API documentation.
@@ -77,8 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcppunit.la
 # non-Linux
-%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/cppunit/{ui/mfc,ui/qt,config/config-{bcb5,evc4,mac,msvc6}.h}
+%{__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
 
@@ -92,19 +95,15 @@ 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}/libcppunit-1.13.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcppunit-1.13.so.0
+%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
-%attr(755,root,root) %{_bindir}/cppunit-config
 %attr(755,root,root) %{_libdir}/libcppunit.so
-%{_libdir}/libcppunit.la
 %{_includedir}/cppunit
-%{_aclocaldir}/cppunit.m4
 %{_pkgconfigdir}/cppunit.pc
-%{_mandir}/man1/cppunit-config.1*
 
 %files static
 %defattr(644,root,root,755)