From a081dade24286d31013b01f30b43e5de93c492da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 16 Aug 2007 19:31:36 +0000
Subject: [PATCH] Release 3-2-4 with tag: REL_mrw-c++-3-2-4

---
 ChangeLog               |  2 ++
 mrw-c++-minimal.spec.in | 14 +++++++++++---
 mrw-c++.spec.in         |  8 ++++----
 mrw/exec_test.cpp       | 17 +++++++++++++++++
 mrw/makefile.am         |  4 +++-
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc8ccb2..5ec5f59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* Tue Aug 16 2007 Marc Waeckerlin - mrw-c++-3.2.4 (mrw)
+	- Changed specfiles to eilminate build problems
 * Sun Aug 5 2007 Marc Waeckerlin - mrw-c++-3.2.3 (mrw)
 	- Spec-file changed for SuSEBuild.org
 * Sun Aug 5 2007 Marc Waeckerlin - mrw-c++-3.2.2 (mrw)
diff --git a/mrw-c++-minimal.spec.in b/mrw-c++-minimal.spec.in
index 0ace775..6e881cc 100644
--- a/mrw-c++-minimal.spec.in
+++ b/mrw-c++-minimal.spec.in
@@ -39,14 +39,22 @@ http://marc.waeckerlin.org/videorekorder/index.html
 
 %prep
 %setup -q
-CXXFLAGS="-O3" ./configure --prefix=$RPM_BUILD_ROOT/usr --datadir=$RPM_BUILD_ROOT/usr/share/doc/packages --disable-threads --disable-autofntrace --disable-log4cxx --disable-ltdl --disable-stacktrace
+CXXFLAGS="-O3" ./configure --prefix=/usr \
+                           --datadir=/usr/share/doc/packages \
+                           --disable-threads --disable-autofntrace \
+                           --disable-log4cxx --disable-ltdl --disable-stacktrace \
+                           --disable-doxygen --disable-dot \
+%ifarch x86_64
+                           --libdir=/usr/lib64
+%else
+                           --libdir=/usr/lib
+%endif                           
 
 %build
 make
 
 %install
-make install
-find "$RPM_BUILD_ROOT" -name '*.la' | xargs perl -pi -e 's#'"${RPM_BUILD_ROOT//+/\\+}"'##g'
+DESTDIR=$RPM_BUILD_ROOT make all install
 rm -r $RPM_BUILD_ROOT/usr/include/mrw
 rmdir $RPM_BUILD_ROOT/usr/include
 rm $RPM_BUILD_ROOT/usr/lib/libmrw-mt*
diff --git a/mrw-c++.spec.in b/mrw-c++.spec.in
index 000de40..29ed801 100644
--- a/mrw-c++.spec.in
+++ b/mrw-c++.spec.in
@@ -32,8 +32,9 @@ This package contains only the shared libraries required at runtime.
 
 %prep
 %setup -q
-CXXFLAGS="-O3" ./configure --prefix=$RPM_BUILD_ROOT/usr \
-                           --datadir=$RPM_BUILD_ROOT/usr/share/doc/packages \
+CXXFLAGS="-O3" ./configure --prefix=/usr \
+                           --datadir=/usr/share/doc/packages \
+                           --enable-doxygen \
 %ifarch x86_64
                            --libdir=/usr/lib64
 %else
@@ -44,8 +45,7 @@ CXXFLAGS="-O3" ./configure --prefix=$RPM_BUILD_ROOT/usr \
 make
 
 %install
-make install
-find "$RPM_BUILD_ROOT" -name '*.la' | xargs perl -pi -e 's#'"${RPM_BUILD_ROOT//+/\\+}"'##g'
+DESTDIR=$RPM_BUILD_ROOT make all install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/mrw/exec_test.cpp b/mrw/exec_test.cpp
index a0130c8..f1edd42 100644
--- a/mrw/exec_test.cpp
+++ b/mrw/exec_test.cpp
@@ -48,27 +48,40 @@
 #include <string>
 #include <stdlib.h>
 
+#include <iostream>
+#ifdef __GNUG__
+#define LOG std::clog<<__PRETTY_FUNCTION__<<'@'<<__FILE__<<':'<<__LINE__;
+#else
+#define LOG std::clog<<__FUNCTION__<<'@'<<__FILE__<<':'<<__LINE__;
+#endif
+
 class ExecTest: public CppUnit::TestFixture {
 public:
   void lsTest() {
+    LOG;
     std::string res = (mrw::Cmd("/bin/ls"), "-l",
                        std::string(getenv("srcdir"))+"/..").execute();
     CPPUNIT_ASSERT(res.find("COPYING")<res.size());
   }
   void catTest() {
+    LOG;
     std::string res = mrw::Cmd("/bin/cat").execute("This is a test");
     CPPUNIT_ASSERT(res=="This is a test");
   }
   void excTest1() {
+    LOG;
     std::string res = (mrw::Cmd("/bin/false")).execute().result();
   }
   void excTest2() {
+    LOG;
     std::string res = (mrw::Cmd("/bin/false")).execute("").result();
   }
   void unexpectedExc() throw(std::bad_exception) {
+    LOG;
     std::string res = (mrw::Cmd("/bin/false")).execute().result();
   }
   void lsTest2() {
+    LOG;
     std::string res;
     mrw::PartialExec exec = (mrw::Cmd("/bin/ls"), "-l",
                              std::string(getenv("srcdir"))+"/..").start();
@@ -76,6 +89,7 @@ public:
     CPPUNIT_ASSERT(res.find("COPYING")<res.size());
   }
   void catTest2() {
+    LOG;
     mrw::PartialExec exec = mrw::Cmd("/bin/cat").start(true);
     std::string res = exec.read("This is a test\n").first;
     res += exec.read("More to come...\n").first;
@@ -84,14 +98,17 @@ public:
     CPPUNIT_ASSERT(res=="This is a test\nMore to come...\n");
   }
   void excTest12() {
+    LOG;
     mrw::PartialExec exec = (mrw::Cmd("/bin/false")).start();
     while (!exec.finished()) exec.read();
   }
   void excTest22() {
+    LOG;
     mrw::PartialExec exec = (mrw::Cmd("/bin/false")).start(true);
     while (!exec.finished()) exec.read("xxx");
   }
   void unexpectedExc2() throw(std::bad_exception) {
+    LOG;
     mrw::PartialExec exec = (mrw::Cmd("/bin/false")).start();
     while (!exec.finished()) exec.read();
   }
diff --git a/mrw/makefile.am b/mrw/makefile.am
index e084988..6caa1f4 100644
--- a/mrw/makefile.am
+++ b/mrw/makefile.am
@@ -374,7 +374,7 @@ TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
 endif
 check_PROGRAMS = $(VALGRIND_CHECKS) $(NO_VALGRIND_CHECKS)
 
-.PHONY: doc clean-local distclean-local dist-hool install-data-hook \
+.PHONY: doc clean-local distclean-local dist-hook install-data-hook \
         uninstall-hook
 
 deps = $(top_srcdir)/COPYING $(top_srcdir)/README $(top_srcdir)/INSTALL $(top_srcdir)/NEWS $(top_srcdir)/ChangeLog
@@ -411,6 +411,7 @@ dist-hook:
 	  mkdir -p $(distdir)/doc/html
 	cp $(top_builddir)/doc/html/* $(distdir)/doc/html/.
 
+if HAVE_DOXYGEN
 install-data-hook:
 	env | grep -i tmp
 	test -d "$(DESTDIR)$(pkgdatadir)/doc" || \
@@ -421,3 +422,4 @@ install-data-hook:
 uninstall-hook:
 	chmod -R u+w "$(DESTDIR)$(pkgdatadir)/doc"
 	rm -rf "$(DESTDIR)$(pkgdatadir)/doc/html"
+endif