[wine] 1.7.30-1

[Andreas Bierfert]

commit e3bf1bd73b1edd34390645806edbbd902a6e3c04
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Sun Nov 2 18:44:21 2014 +0100

    1.7.30-1
    
    - version upgrade (rhbz#1159548)
    - use winepulse patch from compholio patchset when build w/o
      compholio (rhbz#1151862)

 .gitignore              |    6 +-
 sources                 |    6 +-
 wine-pulse-1.7.11.patch | 5254 -----------------------------------------------
 wine.spec               |   39 +-
 4 files changed, 27 insertions(+), 5278 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80d4f23..838d121 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /wine-1.6.1.tar.bz2.sign
 /wine-1.6.1.tar.bz2
-/wine-1.7.29.tar.bz2
-/wine-1.7.29.tar.bz2.sign
-/wine-compholio-1.7.29.tar.gz
+/wine-1.7.30.tar.bz2
+/wine-1.7.30.tar.bz2.sign
+/wine-staging-1.7.30.tar.gz
diff --git a/sources b/sources
index 7227afb..c271700 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-e217beccdba64bff75e67640b68a50f7  wine-1.7.29.tar.bz2
-17d6994c98c23a60fad2bdb422094f83  wine-1.7.29.tar.bz2.sign
-2171d40869a2baf465ae02ac7cb1d126  wine-compholio-1.7.29.tar.gz
+7b224c30bd1874e79c490393cc1deda6  wine-1.7.30.tar.bz2
+86910b1f9a5873ec698b3653607023a1  wine-1.7.30.tar.bz2.sign
+d36fc1c3392f5d38779b238ec61d4d64  wine-staging-1.7.30.tar.gz
diff --git a/wine.spec b/wine.spec
index 6990d08..0ea5065 100644
--- a/wine.spec
+++ b/wine.spec
@@ -10,7 +10,7 @@
 %endif # 0%{?fedora}
 
 Name:           wine
-Version:        1.7.29
+Version:        1.7.30
 Release:        1%{?dist}
 Summary:        A compatibility layer for windows applications
 
@@ -60,21 +60,7 @@ Patch511:       wine-cjk.patch
 
 # wine compholio patches for pipelight.
 # pulseaudio-patch is covered by that patch-set, too.
-%if 0%{?compholio}
-Source900:      https://github.com/compholio/wine-compholio/archive/v%{version}.tar.gz#/wine-compholio-%{version}.tar.gz
-%else # 0%{?compholio}
-## winepulse backend
-# http://repo.or.cz/w/wine/multimedia.git
-# Fri, 31 Jan 2014 10:37:53 +0000
-# based on wine tree 1.7.11
-##
-# git clone http://repo.or.cz/r/wine/multimedia.git
-# cd multimedia
-# git format-patch -k --stdout 28e56d726918e4bc59c456b1947b42f40321763f~..7d0fb975eba0f764a125de6b5ab18aecc56b3db4 > ~/cvs/fedora/rpms/wine/wine-pulse-1.7.11.patch
-# git format-patch -k --stdout 773bf038fd47159d18f8d996bdae2435aaa31f7e~..ba0286680493a48c6795ab8a20a70618ba2ef403 >> ~/cvs/fedora/rpms/wine/wine-pulse-1.7.11.patch
-
-Patch1001:      wine-pulse-1.7.11.patch
-%endif # 0%{?compholio}
+Source900: https://github.com/compholio/wine-compholio/archive/v%{version}.tar.gz#/wine-staging-%{version}.tar.gz
 
 %if !%{?no64bit}
 ExclusiveArch:  %{ix86} x86_64 %{arm}
@@ -107,6 +93,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  fontforge freetype-devel
 BuildRequires:  libgphoto2-devel
 BuildRequires:  isdn4k-utils-devel
+BuildRequires:  libpcap-devel
 # modular x
 BuildRequires:  libX11-devel
 BuildRequires:  mesa-libGL-devel mesa-libGLU-devel mesa-libOSMesa-devel
@@ -593,15 +580,22 @@ This package adds an openal driver for wine.
 %patch511 -p1 -b.cjk
 
 # setup and apply compholio-patches or pulseaudio-patch.
-%if 0%{?compholio}
+# since the pulse patch is included in the compholio patches use it from
+# there
 gzip -dc %{SOURCE900} | tar -xf - --strip-components=1
+
+%if 0%{?compholio}
 %{__make} -C patches DESTDIR="`pwd`" install
 
 # fix parallelized build
 sed -i -e 's!^loader server: libs/port libs/wine tools.*!& include!' Makefile.in
 
 %else # 0%{?compholio}
-%patch1001 -p1 -b.winepulse
+
+for p in `ls patches/winepulse-PulseAudio_Support/*patch`; do
+echo $p
+patch -p1 < $p
+done
 
 # already run after applying compholio-patchset
 autoreconf
@@ -1274,6 +1268,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/msxml4.dll.so
 %{_libdir}/wine/msxml6.dll.so
 %{_libdir}/wine/nddeapi.dll.so
+%{_libdir}/wine/ndis.sys.so
 %{_libdir}/wine/netapi32.dll.so
 %{_libdir}/wine/netcfgx.dll.so
 %{_libdir}/wine/netprofm.dll.so
@@ -1305,6 +1300,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/presentationfontcache.exe.so
 %{_libdir}/wine/printui.dll.so
+%{_libdir}/wine/prntvpt.dll.so
 %{_libdir}/wine/propsys.dll.so
 %{_libdir}/wine/psapi.dll.so
 %{_libdir}/wine/pstorec.dll.so
@@ -1406,6 +1402,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/wintrust.dll.so
 %{_libdir}/wine/wlanapi.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
+%{_libdir}/wine/wpcap.dll.so
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wshom.ocx.so
 %{_libdir}/wine/wsnmp32.dll.so
@@ -1694,6 +1691,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Sun Nov 02 2014 Andreas Bierfert <andreas.bierfert at lowlatency.de>
+- 1.7.30-1
+- version upgrade (rhbz#1159548)
+- use winepulse patch from compholio patchset when build w/o
+  compholio (rhbz#1151862)
+
 * Fri Oct 24 2014 Michael Cronenworth <mike at cchtml.com>
 - 1.7.29-1
 - version upgrade