[wine/f14/master] 1.3.19-1 version upgrade (#701003) remove wine-oss

Thu May 5 19:49:52 UTC 2011

commit cf37a39db511d8bde5cd0db053b48f74f7bb0439
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Thu May 5 21:49:38 2011 +0200

    1.3.19-1
    version upgrade (#701003)
    remove wine-oss

 sources                                            |    1 -
 wine.spec                                          |   28 ++++++++------------
 ...16.patch => winepulse-configure.ac-1.3.19.patch |   20 ++++++++------
 3 files changed, 22 insertions(+), 27 deletions(-)
---

diff --git a/sources b/sources
index c5c66f3..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-17fb6334af12af17feb843f68272b070  wine-1.3.18.tar.bz2
diff --git a/wine.spec b/wine.spec
index 233ce5c..c9abea9 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,6 +1,6 @@
 %global no64bit 0
 Name:           wine
-Version:        1.3.18
+Version:        1.3.19
 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:       winepulse-configure.ac-1.3.16.patch
+Patch400:       http://art.ified.ca/downloads/winepulse/winepulse-configure.ac-1.3.19.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
@@ -175,6 +175,9 @@ Obsoletes:      wine-arts < 0.9.34
 Provides:       wine-arts = %{version}-%{release}
 Obsoletes:      wine-tools <= 1.1.27
 Provides:       wine-tools = %{version}-%{release}
+# removed as of 1.3.19 (we don't support oss4)
+Obsoletes:      wine-oss <= 1.3.18
+Provides:       wine-oss = %{version}-%{release}
 # removed as of 1.3.16
 Obsoletes:      wine-nas <= 1.3.15
 Provides:       wine-nas = %{version}-%{release}
@@ -430,14 +433,6 @@ Requires: wine-core = %{version}-%{release}
 %description alsa
 This package adds an alsa driver for wine.
 
-%package oss
-Summary: OSS support for wine
-Group: System Environment/Libraries
-Requires: wine-core = %{version}-%{release}
-
-%description oss
-This package adds an oss driver for wine.
-
 %if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
 %package openal
 Summary: Openal support for wine
@@ -753,9 +748,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %post alsa -p /sbin/ldconfig
 %postun alsa -p /sbin/ldconfig
 
-%post oss -p /sbin/ldconfig
-%postun oss -p /sbin/ldconfig
-
 %if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
 %post openal -p /sbin/ldconfig
 %postun openal -p /sbin/ldconfig
@@ -1008,6 +1000,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/msrle32.dll.so
 %{_libdir}/wine/mstask.dll.so
 %{_libdir}/wine/msvcirt.dll.so
+%{_libdir}/wine/msvcp60.dll.so
 %{_libdir}/wine/msvcp80.dll.so
 %{_libdir}/wine/msvcp90.dll.so
 %{_libdir}/wine/msvcp100.dll.so
@@ -1406,10 +1399,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %{_libdir}/wine/winealsa.drv.so
 
-%files oss
-%defattr(-,root,root,-)
-%{_libdir}/wine/wineoss.drv.so
-
 %if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
 %files openal
 %defattr(-,root,root,-)
@@ -1417,6 +1406,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Sat Apr 30 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.3.19-1
+- version upgrade (#701003)
+- remove wine-oss
+
 * Sat Apr 16 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.3.18-1
 - version upgrade
diff --git a/winepulse-configure.ac-1.3.16.patch b/winepulse-configure.ac-1.3.19.patch
similarity index 80%
rename from winepulse-configure.ac-1.3.16.patch
rename to winepulse-configure.ac-1.3.19.patch
index b44dd57..edf0777 100644
--- a/winepulse-configure.ac-1.3.16.patch
+++ b/winepulse-configure.ac-1.3.19.patch
@@ -1,6 +1,8 @@
---- wine-1.3.16/configure.ac.winepulse	2011-03-18 20:48:03.000000000 +0100
-+++ wine-1.3.16/configure.ac	2011-03-18 21:28:27.000000000 +0100
-@@ -79,6 +79,7 @@
+diff --git a/configure.ac b/configure.ac
+index 2069561..ab3c983 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,6 +79,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])
@@ -8,7 +10,7 @@
  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])
-@@ -1476,6 +1477,30 @@
+@@ -1484,6 +1485,30 @@ then
      CFLAGS="$save_CFLAGS"
  fi
  
@@ -39,16 +41,16 @@
  dnl **** Check for gstreamer ****
  if test "x$with_gstreamer" != "xno"
  then
-@@ -1672,7 +1697,7 @@
+@@ -1695,7 +1720,7 @@ test "x$ac_cv_type_oss_sysinfo" = xyes || enable_wineoss_drv=${enable_wineoss_dr
  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 \
-         "$ac_cv_header_sys_soundcard_h" != "yes" -a \
-         "$ac_cv_header_machine_soundcard_h" != "yes" -a \
-         "$ac_cv_header_soundcard_h" != "yes" -a \
-@@ -2849,6 +2874,7 @@
+         "x$ac_cv_type_oss_sysinfo" != 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)
  WINE_CONFIG_DLL(wineoss.drv)
  WINE_CONFIG_DLL(wineps.drv)
  WINE_CONFIG_DLL(wineps16.drv16,enable_win16)
