From f9c7bf45e2f251438814e53628db03b2b35cab19 Mon Sep 17 00:00:00 2001 From: pertusus Date: Dec 17 2007 21:14:57 +0000 Subject: add the 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 dbabbf7..851938f 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,6 +1,6 @@ Name: cppunit Version: 1.12.0 -Release: 4%{?dist} +Release: 4%{?dist}.1 Summary: C++ unit testing framework # no license in files @@ -97,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html/ %changelog -* Mon Dec 17 2007 Patrice Dumas 1.12.0-4 +* Mon Dec 17 2007 Patrice Dumas 1.12.0-4.1 - remove libdir reference to cppunit-config, should fix multiarch conflict (#340951) - fix encoding and remove windows related files in examples