rpms/wine/FC-5 .cvsignore, 1.36, 1.37 sources, 1.37, 1.38 wine-rpath.patch, 1.4, 1.5 wine.init, 1.3, 1.4 wine.spec, 1.51, 1.52
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Sat Aug 18 09:07:17 UTC 2007
- Previous message (by thread): rpms/wine/F-7 wine.spec,1.57,1.58
- Next message (by thread): rpms/wine/FC-6 .cvsignore, 1.37, 1.38 sources, 1.38, 1.39 wine-rpath.patch, 1.5, 1.6 wine.init, 1.4, 1.5 wine.spec, 1.52, 1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32313/FC-5
Modified Files:
.cvsignore sources wine-rpath.patch wine.init wine.spec
Log Message:
- fix license tags
- version upgrades for el and fc
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore 28 Jul 2007 08:22:51 -0000 1.36
+++ .cvsignore 18 Aug 2007 09:06:43 -0000 1.37
@@ -1 +1 @@
-wine-0.9.42-fe.tar.bz2
+wine-0.9.43-fe.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/FC-5/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources 28 Jul 2007 08:22:51 -0000 1.37
+++ sources 18 Aug 2007 09:06:43 -0000 1.38
@@ -1 +1 @@
-83b7a278e86d669a6a7ee551f2041b05 wine-0.9.42-fe.tar.bz2
+9fe7207a88c20617c3b558e5e2bab109 wine-0.9.43-fe.tar.bz2
wine-rpath.patch:
Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/FC-5/wine-rpath.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wine-rpath.patch 3 Jun 2007 14:52:01 -0000 1.4
+++ wine-rpath.patch 18 Aug 2007 09:06:43 -0000 1.5
@@ -1,6 +1,6 @@
---- configure.orig 2007-05-23 10:59:34.000000000 +0200
-+++ configure 2007-05-23 11:02:05.000000000 +0200
-@@ -13596,14 +13596,14 @@
+--- configure.orig 2007-08-18 09:42:40.000000000 +0200
++++ configure 2007-08-18 09:44:10.000000000 +0200
+@@ -8525,14 +8525,14 @@
fi
@@ -19,26 +19,30 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13653,7 +13653,7 @@
+@@ -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
-- LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
-+ LIBWINE_LDFLAGS=""
+- 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-05-23 10:59:39.000000000 +0200
-+++ configure.ac 2007-05-23 11:02:39.000000000 +0200
-@@ -1031,11 +1031,6 @@
+--- 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],
-- [LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"],
+- [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+- LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"],
- [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
-- [LIBWINE_LDFLAGS="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])])
+- [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+- LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"])])
-
- case $host_cpu in
- *i[[3456789]]86* | x86_64)
- WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400],
+ WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
+ [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"])
+
Index: wine.init
===================================================================
RCS file: /cvs/pkgs/rpms/wine/FC-5/wine.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wine.init 2 Jan 2006 09:04:37 -0000 1.3
+++ wine.init 18 Aug 2007 09:06:43 -0000 1.4
@@ -6,26 +6,40 @@
# chkconfig: 35 98 10
# description: Allow users to run Windows(tm) applications by just clicking \
# on them (or typing ./file.exe)
+### BEGIN INIT INFO
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop wine binary handler
+# Description: Allow users to run Windows(tm) applications by just clicking
+# on them (or typing ./file.exe)
+### END INIT INFO
+
. /etc/rc.d/init.d/functions
RETVAL=0
start() {
- echo -n $"Registering binary handler for Windows applications"
- /sbin/modprobe binfmt_misc &>/dev/null
- echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
- echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+# fix bug on changing runlevels #213230
+ if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+ echo -n $"Binary handler for Windows applications already registered"
+ else
+ echo -n $"Registering binary handler for Windows applications: "
+ /sbin/modprobe binfmt_misc &>/dev/null
+ echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+ echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && success || failure
+ fi
+ echo
}
stop() {
- echo -n $"Unregistering binary handler for Windows applications"
+ echo -n $"Unregistering binary handler for Windows applications: "
echo "-1" >/proc/sys/fs/binfmt_misc/windows || :
echo "-1" >/proc/sys/fs/binfmt_misc/windowsPE || :
-}
-
-reload() {
- stop
- start
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && success || failure
+ echo
}
wine_status() {
@@ -53,14 +67,15 @@
stop
start
;;
- condrestart)
+ condrestart|try-restart)
+
if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
stop
start
fi
;;
*)
- echo $"Usage: $prog {start|stop|status|restart|condrestart}"
+ echo $"Usage: $prog {start|stop|status|restart|try-restart}"
exit 1
esac
exit $RETVAL
Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- wine.spec 28 Jul 2007 08:22:51 -0000 1.51
+++ wine.spec 18 Aug 2007 09:06:43 -0000 1.52
@@ -1,10 +1,10 @@
Name: wine
-Version: 0.9.42
+Version: 0.9.43
Release: 1%{?dist}
Summary: A Windows 16/32/64 bit emulator
Group: Applications/Emulators
-License: LGPL
+License: LGPLv2+
URL: http://www.winehq.org/
# special fedora tarball without winemp3 stuff build doing
# rm -fr dlls/winemp3.acm
@@ -18,7 +18,7 @@
# Makefile.in:dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
# programs/winecfg/libraries.c: "winemp3.acm",
-Source0: wine-0.9.42-fe.tar.bz2
+Source0: wine-0.9.43-fe.tar.bz2
Source1: wine.init
Source3: wine-README-Fedora
Source4: wine-32.conf
@@ -461,11 +461,13 @@
%{_libdir}/wine/dpnaddr.dll.so
%{_libdir}/wine/dpnet.dll.so
%{_libdir}/wine/dpnhpast.dll.so
+%{_libdir}/wine/dpnlobby.dll.so
%{_libdir}/wine/dsound.dll.so
%{_libdir}/wine/dswave.dll.so
%{_libdir}/wine/dwmapi.dll.so
%{_libdir}/wine/dxdiagn.dll.so
%{_libdir}/wine/eject.exe.so
+%{_libdir}/wine/faultrep.dll.so
%{_libdir}/wine/gdi.exe16
%{_libdir}/wine/gdi32.dll.so
%{_libdir}/wine/gdiplus.dll.so
@@ -485,6 +487,7 @@
%{_libdir}/wine/imm.dll16
%{_libdir}/wine/imm32.dll.so
%{_libdir}/wine/infosoft.dll.so
+%{_libdir}/wine/inkobj.dll.so
%{_libdir}/wine/inseng.dll.so
%{_libdir}/wine/iphlpapi.dll.so
%{_libdir}/wine/itss.dll.so
@@ -517,6 +520,7 @@
%{_libdir}/wine/msftedit.dll.so
%{_libdir}/wine/msg711.acm.so
%{_libdir}/wine/mshtml.dll.so
+%{_libdir}/wine/mshtml.tlb.so
%{_libdir}/wine/msi.dll.so
%{_libdir}/wine/msimg32.dll.so
%{_libdir}/wine/msisys.ocx.so
@@ -629,6 +633,7 @@
%{_libdir}/wine/winex11.drv.so
%{_libdir}/wine/wing.dll16
%{_libdir}/wine/wing32.dll.so
+%{_libdir}/wine/winhttp.dll.so
%{_libdir}/wine/wininet.dll.so
%{_libdir}/wine/winmm.dll.so
%{_libdir}/wine/winnls.dll16
@@ -686,6 +691,7 @@
%{_libdir}/wine/winepath.exe.so
%{_libdir}/wine/winhelp.exe.so
%{_libdir}/wine/winver.exe.so
+%{_libdir}/wine/write.exe.so
%{_libdir}/wine/wordpad.exe.so
%{_datadir}/applications/fedora-wine-notepad.desktop
%{_datadir}/applications/fedora-wine-winefile.desktop
@@ -751,6 +757,16 @@
%{_libdir}/wine/*.def
%changelog
+* Sat Aug 18 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.43-2
+- fix license
+
+* Sat Aug 11 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.43-1
+- version upgrade
+- fix init-script output (#252144)
+- add lsb stuff (#247096)
+
* Sat Jul 28 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 0.9.42-1
- version upgrade
- Previous message (by thread): rpms/wine/F-7 wine.spec,1.57,1.58
- Next message (by thread): rpms/wine/FC-6 .cvsignore, 1.37, 1.38 sources, 1.38, 1.39 wine-rpath.patch, 1.5, 1.6 wine.init, 1.4, 1.5 wine.spec, 1.52, 1.53
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list