Merge branch 'f15'

.gitignore

@@ -13,3 +13,4 @@
 /wine-1.3.17.tar.bz2
 /wine-1.3.18.tar.bz2
 /wine-1.3.19.tar.bz2
+/wine-1.3.20.tar.bz2

sources

@@ -1 +1 @@
-6975269be6e86d7d9da519ed6f3b40a4  wine-1.3.19.tar.bz2
+2d9fe8755172a21ddc453d720a497ad9  wine-1.3.20.tar.bz2

wine.spec

@@ -1,6 +1,6 @@
 %global no64bit 0
 Name:           wine
-Version:        1.3.19
+Version:        1.3.20
 Release:        1%{?dist}
 Summary:        A Windows 16/32/64 bit emulator
 
@@ -37,7 +37,7 @@ Patch200:       wine-imagemagick-6.5.patch
 # explain how to use wine with pulseaudio
 # see http://bugs.winehq.org/show_bug.cgi?id=10495
 # and http://art.ified.ca/?page_id=40
-Patch400:       http://art.ified.ca/downloads/winepulse/winepulse-configure.ac-1.3.19.patch
+Patch400:       http://art.ified.ca/downloads/winepulse/winepulse-configure.ac-1.3.20.patch
 Patch401:       http://art.ified.ca/downloads/winepulse/winepulse-0.39.patch
 Patch402:       http://art.ified.ca/downloads/winepulse/winepulse-winecfg-1.3.11.patch
 Source402:      wine-README-fedora-pulseaudio
@@ -1004,6 +1004,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/mstask.dll.so
 %{_libdir}/wine/msvcirt.dll.so
 %{_libdir}/wine/msvcp60.dll.so
+%{_libdir}/wine/msvcp70.dll.so
+%{_libdir}/wine/msvcp71.dll.so
 %{_libdir}/wine/msvcp80.dll.so
 %{_libdir}/wine/msvcp90.dll.so
 %{_libdir}/wine/msvcp100.dll.so
@@ -1409,6 +1411,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Sun May 15 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.3.20-1
+- version upgrade
+
 * Sat Apr 30 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.3.19-1
 - version upgrade (#701003)

winepulse-configure.ac-1.3.20.patch

@@ -1,8 +1,8 @@
 diff --git a/configure.ac b/configure.ac
-index 2069561..ab3c983 100644
+index d68ae2a..f23f9ed 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -79,6 +79,7 @@ AC_ARG_WITH(png,       AS_HELP_STRING([--without-png],[do not use PNG]),
+@@ -78,6 +78,7 @@ AC_ARG_WITH(png,       AS_HELP_STRING([--without-png],[do not use PNG]),
              [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
  AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
              [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
@@ -10,7 +10,7 @@ index 2069561..ab3c983 100644
  AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
  AC_ARG_WITH(tiff,       AS_HELP_STRING([--without-tiff],[do not use TIFF]),
              [if test "x$withval" = "xno"; then ac_cv_header_tiffio_h=no; fi])
-@@ -1484,6 +1485,30 @@ then
+@@ -1481,6 +1482,30 @@ then
      CFLAGS="$save_CFLAGS"
  fi
  
@@ -41,16 +41,16 @@ index 2069561..ab3c983 100644
  dnl **** Check for gstreamer ****
  if test "x$with_gstreamer" != "xno"
  then
-@@ -1695,7 +1720,7 @@ test "x$ac_cv_type_oss_sysinfo" = xyes || enable_wineoss_drv=${enable_wineoss_dr
+@@ -1695,7 +1720,7 @@ test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=$
  test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
  
  dnl **** Check for any sound system ****
 -if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
 +if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \
-         "x$ac_cv_type_oss_sysinfo" != xyes -a \
+         "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
          "x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono
  then
-@@ -2877,6 +2902,7 @@ WINE_CONFIG_DLL(winenas.drv)
+@@ -2882,6 +2907,7 @@ WINE_CONFIG_DLL(winenas.drv)
  WINE_CONFIG_DLL(wineoss.drv)
  WINE_CONFIG_DLL(wineps.drv)
  WINE_CONFIG_DLL(wineps16.drv16,enable_win16)