rpms/wine/FC-4 .cvsignore, 1.18, 1.19 sources, 1.19, 1.20 wine-rpath.patch, 1.1, 1.2 wine.spec, 1.28, 1.29

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10905/FC-4

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	21 Aug 2006 07:40:54 -0000	1.18
+++ .cvsignore	30 Aug 2006 09:26:03 -0000	1.19
@@ -1 +1 @@
-wine-0.9.19-fe.tar.bz2
+wine-0.9.20-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	21 Aug 2006 07:40:54 -0000	1.19
+++ sources	30 Aug 2006 09:26:03 -0000	1.20
@@ -1 +1 @@
-d903695182690587f44a251059532296  wine-0.9.19-fe.tar.bz2
+8128be3146ab2586ebdc7469792aba62  wine-0.9.20-fe.tar.bz2

wine-rpath.patch:

Index: wine-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-rpath.patch	19 Apr 2006 22:21:54 -0000	1.1
+++ wine-rpath.patch	30 Aug 2006 09:26:03 -0000	1.2
@@ -1,6 +1,6 @@
---- configure.orig	2006-04-15 00:02:02.000000000 +0200
-+++ configure	2006-04-15 00:03:26.000000000 +0200
-@@ -13375,7 +13375,7 @@
+--- configure.orig	2006-08-28 06:44:28.000000000 +0200
++++ configure	2006-08-28 06:46:41.000000000 +0200
+@@ -15903,7 +15903,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_wine_try_cflags_saved=$CFLAGS
@@ -9,33 +9,29 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13427,9 +13427,9 @@
- echo "${ECHO_T}$ac_cv_ld_rpath" >&6
-         if test "$ac_cv_ld_rpath" = "yes"
-         then
--          LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
-+          LDEXERPATH=""
+@@ -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=""
  
--          LDDLLRPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"
-+          LDDLLRPATH=""
+       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-04-15 00:15:32.000000000 +0200
-+++ configure.ac	2006-04-15 00:04:51.000000000 +0200
-@@ -1052,15 +1052,6 @@
-           AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])
-         fi
- 
--        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)\`"])
--          AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"])
--        fi
+-      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
 -
-         case $host_cpu in
-           *i[[3456789]]86*)
-             AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec,
+       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,


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wine.spec	22 Aug 2006 09:19:57 -0000	1.28
+++ wine.spec	30 Aug 2006 09:26:03 -0000	1.29
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.19
+Version:	0.9.20
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -7,7 +7,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.19-fe.tar.bz2
+Source0:        wine-0.9.20-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -299,7 +299,7 @@
 
 %files core
 %defattr(-,root,root,-)
-%doc ANNOUNCE COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD
+%doc ANNOUNCE COPYING.LIB ChangeLog LICENSE LICENSE.OLD
 %doc AUTHORS README-Fedora README VERSION
 %doc documentation/*
 %{_bindir}/msiexec
@@ -310,6 +310,7 @@
 %{_bindir}/winebrowser
 %{_bindir}/wineconsole
 %{_bindir}/wineprefixcreate
+%{_mandir}/man1/wineprefixcreate.1*
 %{_bindir}/wineshelllink
 %{_bindir}/winecfg
 %{_bindir}/uninstaller
@@ -483,6 +484,7 @@
 %{_libdir}/wine/olesvr32.dll.so
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/psapi.dll.so
+%{_libdir}/wine/pstorec.dll.so
 %{_libdir}/wine/qcap.dll.so
 %{_libdir}/wine/quartz.dll.so
 %{_libdir}/wine/query.dll.so
@@ -669,6 +671,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Aug 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.20-1
+- version upgrade
+
 * Mon Aug 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.19-1
 - version upgrade