rpms/wine/F-9 .cvsignore, 1.65, 1.66 sources, 1.66, 1.67 wine-rpath.patch, 1.6, 1.7 wine.spec, 1.91, 1.92

Sun Nov 23 11:14:55 UTC 2008

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16832/F-9

Modified Files:
	.cvsignore sources wine-rpath.patch wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66

--- .cvsignore	23 Oct 2008 17:17:09 -0000	1.65
+++ .cvsignore	23 Nov 2008 11:14:24 -0000	1.66
@@ -1 +1 @@
-wine-1.1.6-fe.tar.bz2
+wine-1.1.9-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	23 Oct 2008 17:17:09 -0000	1.66
+++ sources	23 Nov 2008 11:14:24 -0000	1.67
@@ -1 +1 @@
-af9ee8ba3121695d7ed44710dea854ae  wine-1.1.6-fe.tar.bz2
+b671c6fbce7ed91cce9539cf418a2a75  wine-1.1.9-fe.tar.bz2

wine-rpath.patch:

Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/wine-rpath.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wine-rpath.patch	18 Aug 2007 08:23:03 -0000	1.6
+++ wine-rpath.patch	23 Nov 2008 11:14:24 -0000	1.7
@@ -1,17 +1,17 @@
---- configure.orig	2007-08-18 09:42:40.000000000 +0200
-+++ configure	2007-08-18 09:44:10.000000000 +0200
-@@ -8525,14 +8525,14 @@
+--- configure.orig	2008-11-05 12:25:10.000000000 +0300
++++ configure	2008-11-06 22:22:27.000000000 +0300
+@@ -9306,14 +9306,14 @@
  fi
  
  
--      as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,--rpath,\$ORIGIN/../lib" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
--echo $ECHO_N "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... $ECHO_C" >&6; }
-+      as_ac_var=`echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC" >&5
-+echo $ECHO_N "checking whether the compiler supports -fPIC $ECHO_C" >&6; }
+-      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\$ORIGIN/../lib" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
+-$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
++      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC" >&5
++$as_echo_n "checking whether the compiler supports -fPIC" >&6; }
  if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
 -CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
@@ -19,30 +19,14 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8582,8 +8582,8 @@
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
+@@ -9369,8 +9369,8 @@
+ $as_echo "$ac_res" >&6; }
+ if test `eval 'as_val=${'$as_ac_var'}
+ 		 $as_echo "$as_val"'` = yes; then
 -  LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
 -                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
 +  LDRPATH_INSTALL=""
 +  LDRPATH_LOCAL=""
  else
-   as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
---- configure.ac.orig	2007-08-18 09:44:15.000000000 +0200
-+++ configure.ac	2007-08-18 09:44:46.000000000 +0200
-@@ -439,13 +439,6 @@
-       WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
-                       [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
- 
--      WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
--                      [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
--                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"],
--          [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
--                           [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
--                            LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"])])
--
-       WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
-                       [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"])
- 
+   as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/wine.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- wine.spec	23 Oct 2008 17:17:09 -0000	1.91
+++ wine.spec	23 Nov 2008 11:14:24 -0000	1.92
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.6
+Version:	1.1.9
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -39,10 +39,6 @@
 # mime types
 Source300:      wine-mime-msi.desktop
 
-# enhancements
-Source400:      wineshelllink-fedora
-Patch400:       wine-wineshelllink.patch
-
 # explain how to use wine with pulseaudio
 Source402:      README-FEDORA-PULSEAUDIO
 
@@ -124,7 +120,7 @@
 Summary:        Wine core package
 Group:		Applications/Emulators
 Requires:       %{_bindir}/xmessage
-Requires:       freetype
+Requires:       freetype%{_isa}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Obsoletes:      wine <= 0.9.15-1%{?dist}
@@ -166,7 +162,7 @@
 Summary: JACK sound support for wine
 Group: System Environment/Libraries
 Requires: wine-core = %{version}-%{release}
-Requires: jack-audio-connection-kit
+Requires: jack-audio-connection-kit%{_isa}
 
 %description jack
 JACK sound support for wine
@@ -224,7 +220,6 @@
 %setup -q -n %{name}-%{version}-fe
 %patch1
 %patch2
-%patch400
 
 %build
 # work around gcc bug see #440139
@@ -327,9 +322,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 
-install -p -m755 %{SOURCE400} $RPM_BUILD_ROOT%{_bindir}/wineshelllink-fedora
-
-
 # deploy pulseaudio readme
 cp %{SOURCE402} .
 
@@ -397,8 +389,6 @@
 %{_bindir}/wineconsole
 %{_bindir}/wineprefixcreate
 %{_mandir}/man1/wineprefixcreate.1*
-%{_bindir}/wineshelllink
-%{_bindir}/wineshelllink-fedora
 %{_bindir}/winecfg
 %{_bindir}/uninstaller
 %{_libdir}/wine/expand.exe.so
@@ -474,6 +464,7 @@
 %{_libdir}/wine/ctl3d32.dll.so
 %{_libdir}/wine/ctl3dv2.dll16
 %{_libdir}/wine/d3d10.dll.so
+%{_libdir}/wine/d3d10core.dll.so
 %{_libdir}/wine/d3dim.dll.so
 %{_libdir}/wine/d3drm.dll.so
 %{_libdir}/wine/d3dx9_*.dll.so
@@ -509,6 +500,7 @@
 %{_libdir}/wine/dswave.dll.so
 %{_libdir}/wine/dwmapi.dll.so
 %{_libdir}/wine/dxdiagn.dll.so
+%{_libdir}/wine/dxgi.dll.so
 %{_libdir}/wine/eject.exe.so
 %{_libdir}/wine/faultrep.dll.so
 %{_libdir}/wine/fusion.dll.so
@@ -736,6 +728,10 @@
 %{_libdir}/wine/dnsapi.dll.so
 %{_libdir}/wine/iexplore.exe.so
 %{_libdir}/wine/xcopy.exe.so
+%{_libdir}/wine/xinput1_1.dll.so
+%{_libdir}/wine/xinput1_2.dll.so
+%{_libdir}/wine/xinput1_3.dll.so
+%{_libdir}/wine/xinput9_1_0.dll.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
 
 %files tools
@@ -837,9 +833,18 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Nov 23 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.9-1
+- version upgrade
+
+* Sun Oct 26 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.7-1
+- version upgrade
+
 * Thu Oct 23 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.6-1
 - version upgrade
+- fix multiarch problems (#466892,#467480)
 
 * Sat Sep 20 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.5-1


