From 46f31ca540831f050210e647983268649d9827c8 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Sep 25 2019 13:33:45 +0000 Subject: - version upgrade - own datadir/wine (#206403) - do not include huge changelogs (#204302) --- diff --git a/.cvsignore b/.cvsignore index 3ed4014..c204368 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-0.9.20-fe.tar.bz2 +wine-0.9.21-fe.tar.bz2 diff --git a/sources b/sources index 86bae22..376be9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8128be3146ab2586ebdc7469792aba62 wine-0.9.20-fe.tar.bz2 +98232c907314f15b54d7f685ecfb5535 wine-0.9.21-fe.tar.bz2 diff --git a/wine-rpath.patch b/wine-rpath.patch index a607ada..c26b73c 100644 --- a/wine-rpath.patch +++ b/wine-rpath.patch @@ -1,6 +1,16 @@ ---- configure.orig 2006-08-28 06:44:28.000000000 +0200 -+++ configure 2006-08-28 06:46:41.000000000 +0200 -@@ -15903,7 +15903,7 @@ +--- configure.orig 2006-09-17 14:55:39.000000000 +0200 ++++ configure 2006-09-17 14:57:19.000000000 +0200 +@@ -15903,14 +15903,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; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_wine_try_cflags_saved=$CFLAGS @@ -9,29 +19,24 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -15969,7 +15969,7 @@ - echo "${ECHO_T}$ac_cv_ld_rpath" >&6; } - if test "$ac_cv_ld_rpath" = "yes" - then -- LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" -+ LDEXERPATH="" +@@ -15976,7 +15976,7 @@ + { echo "$as_me:$LINENO: result: $ac_res" >&5 + echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_var'}'` = yes; then +- LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" ++ LIBWINE_LDFLAGS="" + fi - fi ---- configure.ac.orig 2006-08-28 06:43:35.000000000 +0200 -+++ configure.ac 2006-08-28 06:44:22.000000000 +0200 -@@ -1121,14 +1121,6 @@ - AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"]) - fi +--- configure.ac.orig 2006-09-17 14:57:25.000000000 +0200 ++++ configure.ac 2006-09-17 14:58:03.000000000 +0200 +@@ -1058,9 +1058,6 @@ + WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], + [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])]) -- AC_CACHE_CHECK([whether the linker accepts --rpath], ac_cv_ld_rpath, -- [WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], -- ac_cv_ld_rpath="yes",ac_cv_ld_rpath="no")]) -- if test "$ac_cv_ld_rpath" = "yes" -- then -- AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"]) -- fi +- WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], +- [LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"]) - case $host_cpu in *i[[3456789]]86* | x86_64) - AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec, + WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], diff --git a/wine.spec b/wine.spec index a57e5f7..6d482c0 100644 --- a/wine.spec +++ b/wine.spec @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.20 +Version: 0.9.21 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,7 @@ Group: Applications/Emulators License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.20-fe.tar.bz2 +Source0: wine-0.9.21-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -313,7 +313,8 @@ update-desktop-database &>/dev/null || : %defattr(-,root,root,-) %doc ANNOUNCE COPYING.LIB ChangeLog LICENSE LICENSE.OLD %doc AUTHORS README-Fedora README VERSION -%doc documentation/* +# do not include huge changelogs .OLD .ALPHA (#204302) +%doc documentation/README.* %{_bindir}/msiexec %{_bindir}/regedit %{_bindir}/regsvr32 @@ -342,6 +343,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/winevdm.exe.so %{_libdir}/wine/winecfg.exe.so %{_libdir}/wine/uninstaller.exe.so +%dir %{_datadir}/wine %{_datadir}/applications/fedora-wine.desktop %{_datadir}/applications/fedora-wine-regedit.desktop %{_datadir}/applications/fedora-wine-uninstaller.desktop @@ -435,6 +437,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/kernel32.dll.so %{_libdir}/wine/keyboard.drv16 %{_libdir}/wine/krnl386.exe16 +%{_libdir}/wine/localspl.dll.so %{_libdir}/wine/lz32.dll.so %{_libdir}/wine/lzexpand.dll16 %{_libdir}/wine/mapi32.dll.so @@ -525,6 +528,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/sti.dll.so %{_libdir}/wine/storage.dll16 %{_libdir}/wine/stress.dll16 +%{_libdir}/wine/svrapi.dll.so %{_libdir}/wine/system.drv16 %{_libdir}/wine/tapi32.dll.so %{_libdir}/wine/toolhelp.dll16 @@ -595,7 +599,6 @@ update-desktop-database &>/dev/null || : %defattr(-,root,root,-) %{_bindir}/notepad %{_bindir}/progman -%{_bindir}/wcmd %{_bindir}/winedbg %{_bindir}/winedump %{_bindir}/winefile @@ -605,10 +608,10 @@ update-desktop-database &>/dev/null || : %{_bindir}/winhelp %{_libdir}/wine/explorer.exe.so %{_libdir}/wine/control.exe.so +%{_libdir}/wine/cmd.exe.so %{_libdir}/wine/notepad.exe.so %{_libdir}/wine/progman.exe.so %{_libdir}/wine/taskmgr.exe.so -%{_libdir}/wine/wcmd.exe.so %{_libdir}/wine/winedbg.exe.so %{_libdir}/wine/winefile.exe.so %{_libdir}/wine/winemine.exe.so @@ -683,6 +686,12 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/*.def %changelog +* Sun Sep 17 2006 Andreas Bierfert +0.9.21-1 +- version upgrade +- own datadir/wine (#206403) +- do not include huge changelogs (#204302) + * Mon Aug 28 2006 Andreas Bierfert 0.9.20-1 - version upgrade