[wine/el6/master] - drop preloader patch - renew rpath patch

[Andreas Bierfert]

commit 731c89acaa3fc9dd927b8c6edd21e82255e2e9d1
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Tue Oct 19 12:41:16 2010 +0200

    - drop preloader patch
    - renew rpath patch

 wine-preloader-segfault.patch |   11 -----------
 wine-rpath.patch              |   18 +++++++++---------
 wine.spec                     |    7 ++-----
 3 files changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/wine-rpath.patch b/wine-rpath.patch
index 3a66716..6431758 100644
--- a/wine-rpath.patch
+++ b/wine-rpath.patch
@@ -1,16 +1,16 @@
---- configure.old	2010-04-02 20:43:45.000000000 +0300
-+++ configure		2010-04-03 23:26:57.365947610 +0300
-@@ -6727,14 +6727,14 @@ 
+--- configure.orig	2010-10-08 17:29:19.000000000 +0200
++++ configure	2010-10-19 11:35:13.000000000 +0200
+@@ -6811,14 +6811,14 @@
  
  fi
  
 -      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
-+      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
++      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl" | $as_tr_sh`
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5
-+$as_echo_n "checking whether the compiler supports -fPIC" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then :
++$as_echo_n "checking whether the compiler supports -fPIC " >&6; }
+ if eval "test \"\${$as_ac_var+set}\"" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
@@ -19,7 +19,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  int main(int argc, char **argv) { return 0; }
-@@ -6752,17 +6752,17 @@ 
+@@ -6836,17 +6836,17 @@
  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
  if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then :
@@ -33,8 +33,8 @@
 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
 +  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5
-+$as_echo_n "checking whether the compiler supports -fPIC" >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then :
++$as_echo_n "checking whether the compiler supports -fPIC " >&6; }
+ if eval "test \"\${$as_ac_var+set}\"" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
diff --git a/wine.spec b/wine.spec
index afd18a5..0efac2c 100644
--- a/wine.spec
+++ b/wine.spec
@@ -37,9 +37,7 @@ Patch1:         wine-rpath.patch
 # bugfixes
 # fix for #593140
 Patch100:       wine-fonts.patch
-# fix for #617968
-Patch101:       wine-preloader-segfault.patch
-# 
+#
 Patch200:       wine-imagemagick-6.5.patch
 
 # explain how to use wine with pulseaudio
@@ -422,11 +420,10 @@ This package adds an openal driver for wine.
 %endif
 
 %prep
-%setup -q -n %{name}-1.2
+%setup -q
 
 %patch1
 %patch100
-%patch101 -p1
 %patch200
 %patch400 -p1
 %patch401 -p1