diff --git a/.cvsignore b/.cvsignore index 940f4b3..34426fe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-1.1.7-fe.tar.bz2 +wine-1.1.9-fe.tar.bz2 diff --git a/sources b/sources index 2957bac..27a28e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2a4216dd36c202eafaeac56e557c983 wine-1.1.7-fe.tar.bz2 +b671c6fbce7ed91cce9539cf418a2a75 wine-1.1.9-fe.tar.bz2 diff --git a/wine-rpath.patch b/wine-rpath.patch index 8b37fe3..0836ea1 100644 --- a/wine-rpath.patch +++ b/wine-rpath.patch @@ -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 diff --git a/wine.spec b/wine.spec index dd8a67c..b1726ae 100644 --- a/wine.spec +++ b/wine.spec @@ -1,5 +1,5 @@ Name: wine -Version: 1.1.7 +Version: 1.1.9 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -39,10 +39,6 @@ Source201: wine.directory # 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 @@ -224,7 +220,6 @@ with the Wine Windows(TM) emulation libraries. %setup -q -n %{name}-%{version}-fe %patch1 %patch2 -%patch400 %build # work around gcc bug see #440139 @@ -327,9 +322,6 @@ cp %{SOURCE3} README-Fedora 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 @@ update-desktop-database &>/dev/null || : %{_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 @@ update-desktop-database &>/dev/null || : %{_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 @@ -737,6 +728,10 @@ update-desktop-database &>/dev/null || : %{_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 @@ -838,6 +833,10 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/*.def %changelog +* Sun Nov 23 2008 Andreas Bierfert +- 1.1.9-1 +- version upgrade + * Sun Oct 26 2008 Andreas Bierfert - 1.1.7-1 - version upgrade