From 8c7ba060db718badd335e2b939278b358f8efd16 Mon Sep 17 00:00:00 2001
From: pertusus <pertusus@fedoraproject.org>
Date: Sun, 21 Oct 2007 10:13:31 +0000
Subject: [PATCH] - remove libdir reference to cppunit-config, should fix
 multiarch conflict     (#340951) - fix encoding and remove windows related
 files in examples

---
 cppunit-1.12.0-nolibdir.patch | 13 +++++++++++++
 cppunit.spec                  | 32 ++++++++++++++++++++++++--------
 2 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 cppunit-1.12.0-nolibdir.patch

diff --git a/cppunit-1.12.0-nolibdir.patch b/cppunit-1.12.0-nolibdir.patch
new file mode 100644
index 0000000..4786f13
--- /dev/null
+++ b/cppunit-1.12.0-nolibdir.patch
@@ -0,0 +1,13 @@
+diff -up cppunit-1.12.0/cppunit-config.in.nolibdir cppunit-1.12.0/cppunit-config.in
+--- cppunit-1.12.0/cppunit-config.in.nolibdir	2007-10-21 11:19:40.000000000 +0200
++++ cppunit-1.12.0/cppunit-config.in	2007-10-21 11:20:01.000000000 +0200
+@@ -87,9 +87,6 @@ if test "$echo_cflags" = "yes"; then
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      if test @libdir@ != /usr/lib ; then
+-            my_linker_flags="-L@libdir@"
+-      fi
+       echo ${my_linker_flags} -lcppunit @LIBADD_DL@
+ fi      
+ 
diff --git a/cppunit.spec b/cppunit.spec
index 747220e..aaed641 100644
--- a/cppunit.spec
+++ b/cppunit.spec
@@ -3,10 +3,12 @@ Version: 1.12.0
 Release: 3%{?dist}
 
 Summary: C++ unit testing framework
-License: LGPL
+# no license in files
+License: LGPLv2+
 Group: Development/Libraries
 Url: http://cppunit.sourceforge.net/
 Source: http://download.sf.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
@@ -36,6 +38,14 @@ the popular doxygen documentation generation tool.
 
 %prep
 %setup -q
+%patch0 -p1 -b .nolibdir
+for file in THANKS ChangeLog NEWS; do
+   touch -r $file __timestamp_$file
+   iconv -f latin1 -t utf8 < $file > ${file}.utf8
+   mv ${file}.utf8 $file
+   touch -r __timestamp_$file $file
+   rm __timestamp_$file
+done
 
 %build
 %configure --enable-doxygen --disable-static
@@ -49,13 +59,14 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT%{_datadir}/cppunit
 
 # clean up examples
-rm -rf dist-examples dist-examples-dir
-cp -a examples dist-examples
-make -C dist-examples distclean
+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 \) -exec rm {} \;
-mkdir dist-examples-dir
-mv dist-examples dist-examples-dir/examples
+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
@@ -81,10 +92,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root,-)
-%doc dist-examples-dir/examples/
+%doc __dist-examples-dir/examples/
 %doc doc/html/
 
 %changelog
+* Mon Jan 29 2007 Patrice Dumas <pertusus@free.fr> 1.12.0-3
+- remove libdir reference to cppunit-config, should fix multiarch conflict
+  (#340951)
+- fix encoding and remove windows related files in examples
+
 * 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)