[undertaker] Apply the patch correctly

[Petr Machata]

commit b9ca408c1b3909cc25ad7ce9006f242d7927bd25
Author: Petr Machata <pmachata at redhat.com>
Date:   Sun Jul 28 00:58:07 2013 +0200

    Apply the patch correctly

 undertaker-boost_mt.patch |   16 ++++++++--------
 undertaker.spec           |    3 +--
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/undertaker-boost_mt.patch b/undertaker-boost_mt.patch
index 53e7e87..65b049e 100644
--- a/undertaker-boost_mt.patch
+++ b/undertaker-boost_mt.patch
@@ -1,9 +1,9 @@
 diff -up vamos-1.2/undertaker/Makefile~ vamos-1.2/undertaker/Makefile
---- vamos-1.2/undertaker/Makefile~	2013-07-28 00:21:11.976114955 +0200
-+++ vamos-1.2/undertaker/Makefile	2013-07-28 00:42:47.170943941 +0200
+--- vamos-1.2/undertaker/Makefile~	2011-08-30 12:11:34.000000000 +0200
++++ vamos-1.2/undertaker/Makefile	2013-07-28 00:56:25.617959197 +0200
 @@ -13,7 +13,7 @@ CXXFLAGS = $(CFLAGS)
  
- LDFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
+ LDFLAGS =
  # LDCOV = -coverage
 -LDLIBS = libparser.a ../ziz/libziz.a -lstdc++ -lboost_system -lboost_regex -lboost_filesystem -lpicosat -lboost_wave-mt $(LDCOV)
 +LDLIBS = libparser.a ../ziz/libziz.a -lstdc++ -lboost_system -lboost_regex -lboost_filesystem -lpicosat -lboost_wave $(LDCOV)
@@ -11,11 +11,11 @@ diff -up vamos-1.2/undertaker/Makefile~ vamos-1.2/undertaker/Makefile
  PARSEROBJ = RsfReader.o KconfigWhitelist.o ConfigurationModel.o	\
  		    ModelContainer.o SatChecker.o BlockDefectAnalyzer.o  \
 diff -up vamos-1.2/ziz/Makefile~ vamos-1.2/ziz/Makefile
---- vamos-1.2/ziz/Makefile~	2013-07-28 00:21:11.983114997 +0200
-+++ vamos-1.2/ziz/Makefile	2013-07-28 00:42:22.378794488 +0200
-@@ -3,7 +3,7 @@ LDXX=g++ $(CXXFLAGS)
- DEBUG=
- CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic $(DEBUG)
+--- vamos-1.2/ziz/Makefile~	2011-08-24 17:05:15.000000000 +0200
++++ vamos-1.2/ziz/Makefile	2013-07-28 00:56:36.850027021 +0200
+@@ -3,7 +3,7 @@ LDXX=g++
+ DEBUG = -g3
+ CFLAGS = -Wall -Wextra -O2 $(DEBUG)
  CXXFLAGS = $(CFLAGS)
 -LDLIBS = -lboost_regex -lboost_wave-mt -lboost_system-mt $(LDCOV)
 +LDLIBS = -lboost_regex -lboost_wave -lboost_system $(LDCOV)
diff --git a/undertaker.spec b/undertaker.spec
index 0f02d67..5b2c34f 100644
--- a/undertaker.spec
+++ b/undertaker.spec
@@ -70,6 +70,7 @@ Source Elisp code for XEmacs support for %{name}.
 
 %prep
 %setup -q -n vamos-%{version}
+%patch0 -p1
 
 # Fix up one include path
 sed -i 's|picosat/picosat.h|picosat.h|' undertaker/SatChecker.h
@@ -112,8 +113,6 @@ for f in DeadAnalysis ElDocumentation Interactive ModelFiles Preconditions; do
   rm -f doc/Undertaker$f.orig
 done
 
-%patch0 -p1
-
 %build
 # FIXME: building with %%{?_smp_mflags} sometimes fails
 make PREFIX=%{_prefix} LIBDIR=%{_libdir} \