[wine/f18] 1.6.1-1

[Andreas Bierfert]

commit bd0380720abbfa755b4f295783a3ca0b59eeb4d3
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Sun Nov 24 21:14:06 2013 +0100

    1.6.1-1
    
    - version upgrade

 .gitignore                     |    4 ++--
 sources                        |    4 ++--
 wine-1.5.17-osmesa-check.patch |   38 --------------------------------------
 wine-1.6.1-osmesa-check.patch  |   18 ++++++++++++++++++
 wine.spec                      |   11 ++++++++---
 5 files changed, 30 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 512771c..43a2f8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/wine-1.6.tar.bz2.sign
-/wine-1.6.tar.bz2
+/wine-1.6.1.tar.bz2
+/wine-1.6.1.tar.bz2.sign
diff --git a/sources b/sources
index aefe728..e52356c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1192b3bd38f94b823bef19bb0ebe8084  wine-1.6.tar.bz2.sign
-47cf1e121d395e9c8ca1a4ab88f1e658  wine-1.6.tar.bz2
+09c1a34ede1e0a3c418e384ba4fb6359  wine-1.6.1.tar.bz2
+564e2637fe5483a273f89ea6770f5a75  wine-1.6.1.tar.bz2.sign
diff --git a/wine-1.6.1-osmesa-check.patch b/wine-1.6.1-osmesa-check.patch
new file mode 100644
index 0000000..93a5183
--- /dev/null
+++ b/wine-1.6.1-osmesa-check.patch
@@ -0,0 +1,18 @@
+diff -up wine-1.6.1/configure.ac.orig wine-1.6.1/configure.ac
+--- wine-1.6.1/configure.ac.orig	2013-11-24 10:38:31.048058870 +0100
++++ wine-1.6.1/configure.ac	2013-11-24 10:39:50.135433264 +0100
+@@ -1229,7 +1229,13 @@ This probably prevents linking to OpenGL
+ 
+         if test "x$with_osmesa" != "xno"
+         then
+-            WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS])
++            WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++            if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
++                osmesa_save_CC=$CC
++                CC=$CXX
++                WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++                CC=$osmesa_save_CC
++            fi
+             WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
+                              [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
+         fi
diff --git a/wine.spec b/wine.spec
index 1f7d1ca..9911c39 100644
--- a/wine.spec
+++ b/wine.spec
@@ -3,7 +3,7 @@
 %global winemono  0.0.8
 
 Name:           wine
-Version:        1.6
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        A compatibility layer for windows applications
 
@@ -33,8 +33,9 @@ Source109:      wine-oleview.desktop
 
 # build fixes
 # do not check for glAccum
-# wget http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch?revision=1.1
-Patch1:          wine-1.5.17-osmesa-check.patch
+# adjusted for 1.6.1
+# original patch: wget http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch?revision=1.1
+Patch1:          wine-1.6.1-osmesa-check.patch
 
 # wine bugs
 
@@ -1531,6 +1532,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Sat Nov 23 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.6.1-1
+- version upgrade
+
 * Sat Jul 20 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.6-1
 - 1.6 release