diff --git a/.cvsignore b/.cvsignore
index f474b2b..a93fb6d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cppunit-1.11.0.tar.gz
+cppunit-1.12.0.tar.gz
diff --git a/cppunit.spec b/cppunit.spec
index 5617c07..dbabbf7 100644
--- a/cppunit.spec
+++ b/cppunit.spec
@@ -1,12 +1,14 @@
 Name: cppunit
-Version: 1.11.0
-Release: 2%{?dist}
+Version: 1.12.0
+Release: 4%{?dist}
 
 Summary: C++ unit testing framework
-License: LGPL
+# no license in files
+License: LGPLv2+
 Group: Development/Libraries
 Url: http://cppunit.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/cppunit/cppunit-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz
+Patch0: cppunit-1.12.0-nolibdir.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: doxygen, graphviz
@@ -18,6 +20,7 @@ Test output is in XML for automatic testing and GUI based for supervised tests.
 %package devel
 Summary: Libraries and headers for cppunit development
 Group: Development/Libraries
+Requires: pkgconfig, automake
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -27,7 +30,6 @@ programs that use cppunit.
 %package doc
 Summary: HTML formatted API documention for cppunit
 Group: Documentation
-Requires: %{name} = %{version}-%{release}
 
 %description doc
 The cppunit-doc package contains HTML formatted API documention generated by
@@ -35,17 +37,37 @@ the popular doxygen documentation generation tool.
 
 %prep
 %setup -q
+%patch0 -p1 -b .nolibdir
+for file in THANKS ChangeLog NEWS; do
+   iconv -f latin1 -t utf8 < $file > ${file}.utf8
+   touch -r $file ${file}.utf8
+   mv ${file}.utf8 $file
+done
 
 %build
-%configure --enable-doxygen
+export LDFLAGS=-ldl
+%configure --enable-doxygen --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
 # remove double of doc
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/cppunit
+rm -rf $RPM_BUILD_ROOT%{_datadir}/cppunit
+
+# ensure that timestamp of cppunit-config is the same for all arches
+touch -r cppunit-config.in.nolibdir $RPM_BUILD_ROOT%{_bindir}/cppunit-config
+
+# clean up examples
+rm -rf __dist-examples __dist-examples-dir
+cp -a examples __dist-examples
+make -C __dist-examples distclean
+# Makefile.am files are left as documentation
+find __dist-examples \( -name Makefile.in -o -name .cvsignore -o -name '*.dsw' -o -name '*.dsp' \) -exec rm {} \;
+chmod a-x __dist-examples/qt/run.bat
+mkdir __dist-examples-dir
+mv __dist-examples __dist-examples-dir/examples
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,28 +78,52 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ
 %{_bindir}/DllPlugInTester
-%{_mandir}/man1/*
-%{_datadir}/aclocal/*
 %{_libdir}/libcppunit*.so.*
-%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/cppunit-config
 %{_includedir}/cppunit
-%{_libdir}/libcppunit.a
 %{_libdir}/libcppunit.so
+%{_datadir}/aclocal/cppunit.m4
+%{_mandir}/man1/cppunit-config.1*
+%{_libdir}/pkgconfig/cppunit.pc
 
 %files doc
 %defattr(-,root,root,-)
-%doc doc/html/*
+%doc __dist-examples-dir/examples/
+%doc doc/html/
 
 %changelog
+* Mon Dec 17 2007 Patrice Dumas <pertusus@free.fr> 1.12.0-4
+- remove libdir reference to cppunit-config, should fix multiarch conflict
+  (#340951)
+- fix encoding and remove windows related files in examples
+- keep timestamps
+
+* Mon Jan 29 2007 Patrice Dumas <pertusus@free.fr> 1.12.0-3
+- add rightly files to -devel (#224106)
+- add necessary requires for -devel (#224106)
+- ship examples
+
+* Sun Sep 10 2006 Patrice Dumas <pertusus@free.fr> 1.12.0-2
+- rebuild for FC6
+
+* Wed Jul  5 2006 Patrice Dumas <pertusus@free.fr> 1.12.0-1
+- update to 1.12
+
+* Sun May 21 2006 Patrice Dumas <pertusus@free.fr> 1.11.6-1
+- update to 1.11.6
+
+* Wed Dec 21 2005 Patrice Dumas <pertusus@free.fr> 1.11.4-1
+- update
+
 * Mon Aug 15 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.11.0-2
 - various cleanups
 
-* Mon Jul  4 2005 Patrice Dumas <dumas@centre-cired.fr> 1.11.0-1
+* Mon Jul  4 2005 Patrice Dumas <pertusus@free.fr> 1.11.0-1
 - update using the fedora template 
  
 * Sat Apr 14 2001 Bastiaan Bakker <bastiaan.bakker@lifeline.nl>
diff --git a/sources b/sources
index 9a00151..67cd4c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b256f622158d3c932b3c5025ef5e2ed  cppunit-1.11.0.tar.gz
+7493718733ded49a96cf763c5d3eea7f  cppunit-1.12.0.tar.gz