rpms/wine/F-13 winepulse-0.38-configure.ac.patch, NONE, 1.1 .cvsignore, 1.90, 1.91 sources, 1.91, 1.92 wine.spec, 1.127, 1.128 wine-const.patch, 1.1, NONE winepulse-0.35-configure.ac.patch, 1.2, NONE

[Andreas Bierfert]

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5075/F-13

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	winepulse-0.38-configure.ac.patch 
Removed Files:
	wine-const.patch winepulse-0.35-configure.ac.patch 
Log Message:
- version upgrade


winepulse-0.38-configure.ac.patch:
 configure.ac |   29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

--- NEW FILE winepulse-0.38-configure.ac.patch ---
diff --git a/configure.ac b/configure.ac
index 61f376e..6fe1261 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,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])
+AC_ARG_WITH(pulse,     AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
 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])
@@ -1386,6 +1387,31 @@ then
     CFLAGS="$save_CFLAGS"
 fi
 
+dnl **** Check for PulseAudio ****
+AC_SUBST(PULSELIBS,"")
+AC_SUBST(PULSECFLAGS,"")
+if test "x$with_pulse" != "xno";
+then
+    ac_save_CPPFLAGS="$CPPFLAGS"
+    if test "$PKG_CONFIG" != "false";
+    then
+        ac_pulse_libs="`$PKG_CONFIG --libs libpulse 2>/dev/null`"
+        ac_pulse_cflags="`$PKG_CONFIG --cflags libpulse 2>/dev/null`"
+
+        CPPFLAGS="$CPPFLAGS $ac_pulse_cflags"
+        AC_CHECK_HEADERS(pulse/pulseaudio.h,
+            [AC_CHECK_LIB(pulse, pa_stream_is_corked,
+                [AC_DEFINE(HAVE_PULSEAUDIO, 1, [Define if you have pulseaudio])
+                 PULSELIBS="$ac_pulse_libs"
+                 PULSECFLAGS="$ac_pulse_cflags"],,$ac_pulse_libs)
+        ])
+    fi
+    CPPFLAGS="$ac_save_CPPFLAGS"
+fi
+WINE_WARNING_WITH(pulse, [test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"],
+        [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.])
+
+
 dnl **** Check for ALSA 1.x ****
 AC_SUBST(ALSALIBS,"")
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
@@ -1553,7 +1579,7 @@ dnl **** Check for libodbc ****
 WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
 
 dnl **** Check for any sound system ****
-if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
+if test "x$ALSALIBS$AUDIOIOLIBS$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 \
@@ -2648,6 +2674,7 @@ WINE_CONFIG_DLL(winenas.drv)
 WINE_CONFIG_DLL(wineoss.drv)
 WINE_CONFIG_DLL(wineps.drv)
 WINE_CONFIG_DLL(wineps16.drv16,enable_win16)
+WINE_CONFIG_DLL(winepulse.drv)
 WINE_CONFIG_DLL(winequartz.drv)
 WINE_CONFIG_DLL(winex11.drv)
 WINE_CONFIG_DLL(wing.dll16,enable_win16)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-13/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- .cvsignore	4 Jul 2010 14:42:21 -0000	1.90
+++ .cvsignore	12 Jul 2010 15:41:43 -0000	1.91
@@ -1 +1 @@
-wine-1.2-rc6.tar.bz2
+wine-1.2-rc7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-13/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	4 Jul 2010 14:42:21 -0000	1.91
+++ sources	12 Jul 2010 15:41:43 -0000	1.92
@@ -1 +1 @@
-689c6ae6baaa33ca6532af2cec05d26b  wine-1.2-rc6.tar.bz2
+05cc63418e603f3d689bcaa7c7768d01  wine-1.2-rc7.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-13/wine.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- wine.spec	4 Jul 2010 14:42:21 -0000	1.127
+++ wine.spec	12 Jul 2010 15:41:43 -0000	1.128
@@ -1,13 +1,13 @@
 %define no64bit 0
 Name:		wine
 Version:	1.2.0
-Release:	0.6.rc6%{?dist}
+Release:	0.7.rc7%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPLv2+
 URL:		http://www.winehq.org/
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc6.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc7.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -44,8 +44,7 @@ Patch200:       wine-imagemagick-6.5.pat
 # 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
-# rebased for .42 see #580073
-Patch400:       winepulse-0.35-configure.ac.patch
+Patch400:       http://art.ified.ca/downloads/winepulse/winepulse-0.38-configure.ac.patch
 Patch401:       http://art.ified.ca/downloads/winepulse/winepulse-0.38.patch
 Patch402:       http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch
 Source402:      README-FEDORA-PULSEAUDIO
@@ -223,7 +222,10 @@ Requires:      wine-marlett-fonts = %{ve
 #Requires:      wine-tahoma-fonts = %{version}-%{release}
 Requires:      wine-symbol-fonts = %{version}-%{release}
 # intermediate fix for #593140
-Requires:      liberation-sans-fonts liberation-serif-fonts liberation-narrow-fonts
+Requires:      liberation-sans-fonts liberation-serif-fonts liberation-mono-fonts
+%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+Requires:      liberation-narrow-fonts
+%endif
 
 %description fonts
 %{summary}
@@ -410,12 +412,12 @@ This package adds an openal driver for w
 
 
 %prep
-%setup -q -n %{name}-1.2-rc6
+%setup -q -n %{name}-1.2-rc7
 
 %patch1
 %patch100
 %patch200
-%patch400
+%patch400 -p1
 %patch401 -p1
 %patch402 -p1
 %patch1000
@@ -1126,30 +1128,37 @@ update-desktop-database &>/dev/null || :
 
 %files courier-fonts
 %defattr(-,root,root,-)
+%doc COPYING.LIB
 %{_datadir}/fonts/wine-courier-fonts
 
 %files system-fonts
 %defattr(-,root,root,-)
+%doc COPYING.LIB
 %{_datadir}/fonts/wine-system-fonts
 
 %files small-fonts
 %defattr(-,root,root,-)
+%doc COPYING.LIB
 %{_datadir}/fonts/wine-small-fonts
 
 %files marlett-fonts
+%doc COPYING.LIB
 %defattr(-,root,root,-)
 %{_datadir}/fonts/wine-marlett-fonts
 
 #%files ms-sans-serif-fonts
 #%defattr(-,root,root,-)
+#%doc COPYING.LIB
 #%{_datadir}/fonts/wine-ms-sans-serif-fonts
 
 #%files tahoma-fonts
 #%defattr(-,root,root,-)
+#%doc COPYING.LIB
 #%{_datadir}/fonts/wine-tahoma-fonts
 
 %files symbol-fonts
 %defattr(-,root,root,-)
+%doc COPYING.LIB
 %{_datadir}/fonts/wine-symbol-fonts
 
 %files desktop
@@ -1255,6 +1264,12 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/openal32.dll.so
 
 %changelog
+* Sun Jul 11 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2-0.7.rc7
+- version upgrade
+- make sure font packages include the license file in case they are installed
+  standalone
+
 * Sun Jul 04 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.2-0.6.rc6
 - version upgrade


--- wine-const.patch DELETED ---


--- winepulse-0.35-configure.ac.patch DELETED ---