- updated to 1.9.12

Changed files:
    cppunit.spec -> 1.9

diff --git a/cppunit.spec b/cppunit.spec
index 55264c9e8de0e3e98e2fa8c5e033cfd2d209f8d5..889308ebd6ceed4c3dbcb5e866285ce3113bbee8 100644 (file)
--- a/cppunit.spec
+++ b/cppunit.spec
@@ -1,17 +1,18 @@
 Summary:       The C++ Unit Test Library
 Summary(pl):   Biblioteka testowa do C++
 Name:          cppunit
-Version:       1.8.0
+Version:       1.9.12
 Release:       1
 License:       LGPL
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/cppunit/%{name}-%{version}.tar.gz
-# Source0-md5: 9f18d97ca99b4f095f5ff18139df59c3
+# Source0-md5: ae7a18c46710bde7e2e5f814696e1fda
 URL:           http://cppunit.sourceforge.net/
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake >= 1.4
 BuildRequires: doxygen
 BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:1.4d
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -25,7 +26,7 @@ CppUnit jest portem C++ s
 Summary:       cppunit header files
 Summary(pl):   Pliki nag³ówkowe cppunit
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 cppunit header files.
@@ -37,7 +38,7 @@ Pliki nag
 Summary:       cppunit static library
 Summary(pl):   Statyczna biblioteka cppunit
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 cppunit static library.
@@ -48,12 +49,13 @@ Statyczna biblioteka cppunit.
 %prep
 %setup -q
 
-echo 'libcppunit_la_LIBADD = -lstdc++ -lpthread' >> src/cppunit/Makefile.am
+echo 'libcppunit_la_LIBADD = -ldl' >> src/cppunit/Makefile.am
 
 %build
-rm -f missing
+%{__libtoolize}
 %{__aclocal} -I config
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure
 %{__make}
@@ -64,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_includedir}/cppunit/{ui/mfc,ui/qt,config-[bm]*}
+rm -rf $RPM_BUILD_ROOT%{_includedir}/cppunit/{ui/mfc,ui/qt,config/config-[bm]*}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,8 +83,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc/FAQ doc/html
 %attr(755,root,root) %{_bindir}/cppunit-config
-%{_libdir}/lib*.la
 %attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/cppunit
 %{_aclocaldir}/cppunit.m4
 %{_mandir}/man1/cppunit-config.1*