0.0-0.fdr.2.20030911 - Fix SSL detection (need krb5), require openssl. - Disable ALSA by default, use "--with alsa" to enable. - Disable valgrind by default, use "--with valgrind" to enable. - Cosmetic improvements. Tue Sep 16 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030911 - update to 20030911 Tue Aug 19 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030813 - update to 20030813 Thu Jul 10 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030709 - update to 20030709 - add /lib/tls requirement -> only works with NTPL capable systems Wed Jul 02 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030618 - update to 20030618 Thu May 22 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030508 - update to 20030508 - add buildreq's & other QA issues from #255 Sat May 03 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030408 - package for fedora - based on modified RH wine from 8.0 found off the netf38
cvsextras
21 years ago
parent
9f3a37c85a
commit
b784050837
@ -0,0 +1 @@
|
|||||||
|
Wine-20030911.tar.gz
|
||||||
@ -0,0 +1,51 @@
|
|||||||
|
Index: wine/libs/wine/config.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /home/wine/wine/libs/wine/config.c,v
|
||||||
|
retrieving revision 1.1
|
||||||
|
diff -u -r1.1 config.c
|
||||||
|
--- wine/libs/wine/config.c 22 Mar 2003 20:40:48 -0000 1.1
|
||||||
|
+++ wine/libs/wine/config.c 26 Nov 2002 18:37:03 -0000
|
||||||
|
@@ -136,7 +136,20 @@
|
||||||
|
if (config_dir[0] != '/')
|
||||||
|
fatal_error( "invalid directory %s in WINEPREFIX: not an absolute path\n", prefix );
|
||||||
|
if (stat( config_dir, &st ) == -1)
|
||||||
|
- fatal_perror( "cannot open %s as specified in WINEPREFIX", config_dir );
|
||||||
|
+ {
|
||||||
|
+ /* No configuration - put in defaults. */
|
||||||
|
+ char command[512];
|
||||||
|
+ mkdir(config_dir, 0700);
|
||||||
|
+ sprintf(command, "/bin/cp /etc/wine/wine.conf %s/config", config_dir);
|
||||||
|
+ system(command);
|
||||||
|
+ sprintf(command, "/bin/cp /etc/wine/system.reg %s/system.reg", config_dir);
|
||||||
|
+ system(command);
|
||||||
|
+ sprintf(command, "/bin/cp /etc/wine/user.reg %s/user.reg", config_dir);
|
||||||
|
+ system(command);
|
||||||
|
+ sprintf(command, "/bin/cp /etc/wine/userdef.reg %s/userdef.reg", config_dir);
|
||||||
|
+ system(command);
|
||||||
|
+ stat( config_dir, &st );
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -147,7 +160,20 @@
|
||||||
|
remove_trailing_slashes( config_dir );
|
||||||
|
strcat( config_dir, server_config_dir );
|
||||||
|
if (stat( config_dir, &st ) == -1)
|
||||||
|
- fatal_perror( "cannot open %s", config_dir );
|
||||||
|
+ {
|
||||||
|
+ /* No configuration - put in defaults. */
|
||||||
|
+ char command[512];
|
||||||
|
+ mkdir(config_dir, 0700);
|
||||||
|
+ sprintf(command, "/bin/cp /etc/wine/wine.conf %s/config", config_dir);
|
||||||
|
+ system(command);
|
||||||
|
+ sprintf(command, "/bin/cp /etc/wine/system.reg %s/system.reg", config_dir);
|
||||||
|
+ system(command);
|
||||||
|
+ sprintf(command, "/bin/cp /etc/wine/user.reg %s/user.reg", config_dir);
|
||||||
|
+ system(command);
|
||||||
|
+ sprintf(command, "/bin/cp /etc/wine/userdef.reg %s/userdef.reg", config_dir);
|
||||||
|
+ system(command);
|
||||||
|
+ stat( config_dir, &st );
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
if (!S_ISDIR(st.st_mode)) fatal_error( "%s is not a directory\n", config_dir );
|
||||||
|
|
||||||
@ -0,0 +1,104 @@
|
|||||||
|
Index: wine/misc/registry.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /home/wine/wine/misc/registry.c,v
|
||||||
|
retrieving revision 1.125
|
||||||
|
diff -u -r1.125 registry.c
|
||||||
|
--- wine/misc/registry.c 30 Mar 2003 03:05:12 -0000 1.125
|
||||||
|
+++ wine/misc/registry.c 26 Nov 2002 18:21:01 -0000
|
||||||
|
@@ -1609,14 +1609,65 @@
|
||||||
|
|
||||||
|
strcpy(tmp,confdir);
|
||||||
|
strcat(tmp,"/" SAVE_LOCAL_REGBRANCH_USER_DEFAULT);
|
||||||
|
+ if (access( tmp, R_OK ) && !access( "/etc/wine/" SAVE_LOCAL_REGBRANCH_USER_DEFAULT, R_OK )) {
|
||||||
|
+ /* If the registry doesn't exist, copy the global one */
|
||||||
|
+ FILE *in, *out;
|
||||||
|
+ char buf[1024];
|
||||||
|
+ in = fopen( "/etc/wine/" SAVE_LOCAL_REGBRANCH_USER_DEFAULT, "r" );
|
||||||
|
+ if(!in)
|
||||||
|
+ return;
|
||||||
|
+ out = fopen( tmp, "w" );
|
||||||
|
+ if(!out) {
|
||||||
|
+ fclose(in);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ while(fgets(buf, 1024, in))
|
||||||
|
+ fputs(buf, out);
|
||||||
|
+ fclose(in);
|
||||||
|
+ fclose(out);
|
||||||
|
+ }
|
||||||
|
load_wine_registry(hkey_users_default,tmp);
|
||||||
|
|
||||||
|
strcpy(tmp,confdir);
|
||||||
|
strcat(tmp,"/" SAVE_LOCAL_REGBRANCH_CURRENT_USER);
|
||||||
|
+ if (access( tmp, R_OK ) && !access( "/etc/wine/" SAVE_LOCAL_REGBRANCH_CURRENT_USER, R_OK )) {
|
||||||
|
+ /* If the registry doesn't exist, copy the global one */
|
||||||
|
+ FILE *in, *out;
|
||||||
|
+ char buf[1024];
|
||||||
|
+ in = fopen( "/etc/wine/" SAVE_LOCAL_REGBRANCH_CURRENT_USER, "r" );
|
||||||
|
+ if(!in)
|
||||||
|
+ return;
|
||||||
|
+ out = fopen( tmp, "w" );
|
||||||
|
+ if(!out) {
|
||||||
|
+ fclose(in);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ while(fgets(buf, 1024, in))
|
||||||
|
+ fputs(buf, out);
|
||||||
|
+ fclose(in);
|
||||||
|
+ fclose(out);
|
||||||
|
+ }
|
||||||
|
load_wine_registry(hkey_current_user,tmp);
|
||||||
|
|
||||||
|
strcpy(tmp,confdir);
|
||||||
|
strcat(tmp,"/" SAVE_LOCAL_REGBRANCH_LOCAL_MACHINE);
|
||||||
|
+ if (access( tmp, R_OK ) && !access( "/etc/wine/" SAVE_LOCAL_REGBRANCH_LOCAL_MACHINE, R_OK )) {
|
||||||
|
+ /* If the registry doesn't exist, copy the global one */
|
||||||
|
+ FILE *in, *out;
|
||||||
|
+ char buf[1024];
|
||||||
|
+ in = fopen( "/etc/wine/" SAVE_LOCAL_REGBRANCH_LOCAL_MACHINE, "r" );
|
||||||
|
+ if(!in)
|
||||||
|
+ return;
|
||||||
|
+ out = fopen( tmp, "w" );
|
||||||
|
+ if(!out) {
|
||||||
|
+ fclose(in);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ while(fgets(buf, 1024, in))
|
||||||
|
+ fputs(buf, out);
|
||||||
|
+ fclose(in);
|
||||||
|
+ fclose(out);
|
||||||
|
+ }
|
||||||
|
load_wine_registry(hkey_local_machine,tmp);
|
||||||
|
|
||||||
|
free(tmp);
|
||||||
|
Index: wine/server/registry.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /home/wine/wine/server/registry.c,v
|
||||||
|
retrieving revision 1.50
|
||||||
|
diff -u -r1.50 registry.c
|
||||||
|
--- wine/server/registry.c 25 Feb 2003 04:04:18 -0000 1.50
|
||||||
|
+++ wine/server/registry.c 26 Nov 2002 18:21:02 -0000
|
||||||
|
@@ -1486,6 +1486,23 @@
|
||||||
|
if (!(filename = malloc( strlen(config) + 8 ))) fatal_error( "out of memory\n" );
|
||||||
|
strcpy( filename, config );
|
||||||
|
strcat( filename, "/config" );
|
||||||
|
+ if (access( filename, R_OK ) && !access( "/etc/wine/wine.conf", R_OK )) {
|
||||||
|
+ /* If the registry doesn't exist, copy the global one */
|
||||||
|
+ FILE *in, *out;
|
||||||
|
+ char buf[1024];
|
||||||
|
+ in = fopen( "/etc/wine/wine.conf", "r" );
|
||||||
|
+ if(!in)
|
||||||
|
+ return;
|
||||||
|
+ out = fopen( filename, "w" );
|
||||||
|
+ if(!out) {
|
||||||
|
+ fclose(in);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ while(fgets(buf, 1024, in))
|
||||||
|
+ fputs(buf, out);
|
||||||
|
+ fclose(in);
|
||||||
|
+ fclose(out);
|
||||||
|
+ }
|
||||||
|
if ((f = fopen( filename, "r" )))
|
||||||
|
{
|
||||||
|
struct key *key;
|
||||||
@ -0,0 +1,153 @@
|
|||||||
|
Index: wine/tools/wineshelllink
|
||||||
|
===================================================================
|
||||||
|
RCS file: /home/wine/wine/tools/wineshelllink,v
|
||||||
|
retrieving revision 1.15
|
||||||
|
diff -u -r1.15 wineshelllink
|
||||||
|
--- wine/tools/wineshelllink 23 May 2002 16:31:22 -0000 1.15
|
||||||
|
+++ wine/tools/wineshelllink 26 Nov 2002 18:26:48 -0000
|
||||||
|
@@ -77,22 +77,7 @@
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
|
||||||
|
-kde_entry()
|
||||||
|
-{
|
||||||
|
- xname=`basename "$link"`
|
||||||
|
- cat <<EOF
|
||||||
|
-# KDE Config File
|
||||||
|
-[KDE Desktop Entry]
|
||||||
|
-Name=$xname
|
||||||
|
-Exec=wine '$path' -- $args
|
||||||
|
-Type=Application
|
||||||
|
-Comment=$descr
|
||||||
|
-EOF
|
||||||
|
- [ -z "$workdir" ] || echo "Path=\"$workdir\""
|
||||||
|
- [ -z "$xpmicon" ] || echo "Icon=$xpmicon"
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-gnome_entry()
|
||||||
|
+make_entry()
|
||||||
|
{
|
||||||
|
xname=`basename "$link"`
|
||||||
|
cat <<EOF
|
||||||
|
@@ -129,31 +114,7 @@
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
-# Debian/Mandrake
|
||||||
|
-
|
||||||
|
-which update-menus > /dev/null 2>&1
|
||||||
|
-if [ $? = 0 -a $mode = "menu" ]
|
||||||
|
-then
|
||||||
|
- iconname="`basename "$link"`.xpm"
|
||||||
|
- dir="$HOME/.menu/icons"
|
||||||
|
- if [ -f "$icon" ]
|
||||||
|
- then
|
||||||
|
- mkdir -p "$dir"
|
||||||
|
- cp "$icon" "$dir/$iconname"
|
||||||
|
- xpmicon="$dir/$iconname"
|
||||||
|
- else
|
||||||
|
- xpmicon=""
|
||||||
|
- fi
|
||||||
|
- mdk_entry >> "$HOME/.menu/wine"
|
||||||
|
- if [ -d "/usr/lib/menu" ]
|
||||||
|
- then
|
||||||
|
- mdk_entry >> "/usr/lib/menu/wine"
|
||||||
|
- fi
|
||||||
|
- update-menus > /dev/null 2>&1
|
||||||
|
-fi
|
||||||
|
-
|
||||||
|
# KDE
|
||||||
|
-
|
||||||
|
if [ -d "$HOME/.kde" ]
|
||||||
|
then
|
||||||
|
kdeversion=0
|
||||||
|
@@ -167,30 +128,13 @@
|
||||||
|
copy_icon "$HOME/.kde/share/applnk/Wine"
|
||||||
|
if [ $mode = "menu" ]
|
||||||
|
then
|
||||||
|
- gnome_entry > "$HOME/.kde/share/applnk/Wine/$link.desktop"
|
||||||
|
+ make_entry > "$HOME/.kde/share/applnk/Wine/$link.desktop"
|
||||||
|
elif [ -d "$HOME/Desktop" ]
|
||||||
|
then
|
||||||
|
- gnome_entry > "$HOME/Desktop/$link.desktop"
|
||||||
|
+ make_entry > "$HOME/Desktop/$link.desktop"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
- copy_icon "$HOME/.kde/share/applnk/Wine"
|
||||||
|
- if [ $mode = "menu" ]
|
||||||
|
- then
|
||||||
|
- kde_entry > "$HOME/.kde/share/applnk/Wine/$link.kdelnk"
|
||||||
|
-
|
||||||
|
- # KDE 1.x kludge. Wake up KDE, if we can find kpanel running
|
||||||
|
- which kwmcom >/dev/null 2>/dev/null && \
|
||||||
|
- ps u -C kpanel >/dev/null 2>/dev/null && \
|
||||||
|
- kwmcom kpanel:restart
|
||||||
|
-
|
||||||
|
- elif [ -d "$HOME/Desktop" ]
|
||||||
|
- then
|
||||||
|
- kde_entry > "$HOME/Desktop/$link.kdelnk"
|
||||||
|
- # KDE 1.x kludge: wake up KDE, if we can find kfm running...
|
||||||
|
- which kfmclient >/dev/null 2>/dev/null && \
|
||||||
|
- ps u -C kfm >/dev/null 2>/dev/null && \
|
||||||
|
- kfmclient refreshDesktop
|
||||||
|
- fi
|
||||||
|
+ echo "KDE < 2 not supported anymore"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
@@ -199,15 +143,15 @@
|
||||||
|
copy_icon "$HOME/.kde2/share/applnk/Wine"
|
||||||
|
if [ $mode = "menu" ]
|
||||||
|
then
|
||||||
|
- gnome_entry > "$HOME/.kde2/share/applnk/Wine/$link.desktop"
|
||||||
|
+ make_entry > "$HOME/.kde2/share/applnk/Wine/$link.desktop"
|
||||||
|
else
|
||||||
|
if [ -d "$HOME/Desktop2" ]
|
||||||
|
then
|
||||||
|
- gnome_entry > "$HOME/Desktop2/$link.desktop"
|
||||||
|
+ make_entry > "$HOME/Desktop2/$link.desktop"
|
||||||
|
fi
|
||||||
|
if [ -d "$HOME/Desktop" ]
|
||||||
|
then
|
||||||
|
- gnome_entry > "$HOME/Desktop/$link.desktop"
|
||||||
|
+ make_entry > "$HOME/Desktop/$link.desktop"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
@@ -217,19 +161,19 @@
|
||||||
|
copy_icon "$HOME/.kde3/share/applnk/Wine"
|
||||||
|
if [ $mode = "menu" ]
|
||||||
|
then
|
||||||
|
- gnome_entry > "$HOME/.kde3/share/applnk/Wine/$link.desktop"
|
||||||
|
+ make_entry > "$HOME/.kde3/share/applnk/Wine/$link.desktop"
|
||||||
|
else
|
||||||
|
if [ -d "$HOME/Desktop3" ]
|
||||||
|
then
|
||||||
|
- gnome_entry > "$HOME/Desktop3/$link.desktop"
|
||||||
|
+ make_entry > "$HOME/Desktop3/$link.desktop"
|
||||||
|
fi
|
||||||
|
if [ -d "$HOME/Desktop2" ]
|
||||||
|
then
|
||||||
|
- gnome_entry > "$HOME/Desktop2/$link.desktop"
|
||||||
|
+ make_entry > "$HOME/Desktop2/$link.desktop"
|
||||||
|
fi
|
||||||
|
if [ -d "$HOME/Desktop" ]
|
||||||
|
then
|
||||||
|
- gnome_entry > "$HOME/Desktop/$link.desktop"
|
||||||
|
+ make_entry > "$HOME/Desktop/$link.desktop"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
@@ -241,10 +185,10 @@
|
||||||
|
copy_icon "$HOME/.gnome/apps/Wine"
|
||||||
|
if [ $mode = "menu" ]
|
||||||
|
then
|
||||||
|
- gnome_entry > "$HOME/.gnome/apps/Wine/$link.desktop"
|
||||||
|
+ make_entry > "$HOME/.gnome/apps/Wine/$link.desktop"
|
||||||
|
elif [ -d "$HOME/.gnome-desktop" ]
|
||||||
|
then
|
||||||
|
- gnome_entry > "$HOME/.gnome-desktop/$link.desktop"
|
||||||
|
+ make_entry > "$HOME/.gnome-desktop/$link.desktop"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
@ -0,0 +1,92 @@
|
|||||||
|
Index: wine/programs/winelauncher.in
|
||||||
|
===================================================================
|
||||||
|
RCS file: /home/wine/wine/programs/winelauncher.in,v
|
||||||
|
retrieving revision 1.2
|
||||||
|
diff -u -r1.2 winelauncher.in
|
||||||
|
--- wine/programs/winelauncher.in 5 Jul 2002 21:18:41 -0000 1.2
|
||||||
|
+++ wine/programs/winelauncher.in 26 Nov 2002 17:52:47 -0000
|
||||||
|
@@ -93,27 +93,11 @@
|
||||||
|
|
||||||
|
launch_winesetup()
|
||||||
|
{
|
||||||
|
- which winesetup
|
||||||
|
- if [ $? -eq 0 ] ; then
|
||||||
|
- winesetup
|
||||||
|
- else
|
||||||
|
- if [ -x /opt/wine/bin/winesetup ] ; then
|
||||||
|
- /opt/wine/bin/winesetup
|
||||||
|
- else
|
||||||
|
- $XMESSAGE -title "Error" \
|
||||||
|
- "Error: Unable to find winesetup in your PATH or in /opt/wine/bin:
|
||||||
|
- I am not able to configure Wine.
|
||||||
|
-
|
||||||
|
- If winesetup is being distributed in a separate package
|
||||||
|
- that is not installed yet on your system, then please install this
|
||||||
|
- package.
|
||||||
|
- winesetup can also be downloaded from www.codeweavers.com.
|
||||||
|
-
|
||||||
|
- If you choose to not use winesetup for configuration, then
|
||||||
|
- you can find information on how to prepare a Wine config file manually
|
||||||
|
- in the Wine README / README.gz file or in the Wine User Guide."
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
+ mkdir ~/.wine
|
||||||
|
+ cp /etc/wine/wine.conf ~/.wine/config
|
||||||
|
+ cp /etc/wine/system.reg ~/.wine/system.reg
|
||||||
|
+ cp /etc/wine/user.ref ~/.wine/user.reg
|
||||||
|
+ cp /etc/wine/userdef.reg ~/.wine/userdef.reg
|
||||||
|
}
|
||||||
|
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
|
@@ -247,7 +231,7 @@
|
||||||
|
if [ $no_args -eq 1 ] ; then
|
||||||
|
echo "Wine called with no arguments."
|
||||||
|
echo "Invoking $WINEBIN/$WINE_BIN_NAME $@ ..."
|
||||||
|
- $XMESSAGE -buttons " Okay ":0," See the Wine Usage Statement ":1," Configure Wine ":2 \
|
||||||
|
+ $XMESSAGE -buttons " Okay ":0," See the Wine Usage Statement ":1," Copy default config ":2 \
|
||||||
|
-title "Welcome to Wine" \
|
||||||
|
"
|
||||||
|
|
||||||
|
@@ -290,14 +274,8 @@
|
||||||
|
|
||||||
|
while [ $conf -eq 0 ] ; do
|
||||||
|
|
||||||
|
- if [ -f ~/.winerc ] ; then
|
||||||
|
- conf=1
|
||||||
|
- fi
|
||||||
|
if [ -f ~/.wine/config ] ; then
|
||||||
|
- conf=2
|
||||||
|
- fi
|
||||||
|
- if [ -f /etc/wine.conf ] ; then
|
||||||
|
- conf=3
|
||||||
|
+ conf=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $conf -ne 0 ] ; then
|
||||||
|
@@ -305,7 +283,7 @@
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "No configuration file detected."
|
||||||
|
- $XMESSAGE -buttons " Cancel ":0," Proceed ":1," Configure Wine ":2 \
|
||||||
|
+ $XMESSAGE -buttons " Cancel ":0," Proceed ":1," Copy default config ":2 \
|
||||||
|
-title "Welcome to Wine" \
|
||||||
|
"
|
||||||
|
|
||||||
|
@@ -313,7 +291,7 @@
|
||||||
|
configuration file.
|
||||||
|
|
||||||
|
This is normal if you have never run Wine before.
|
||||||
|
- If this is the case, select the 'Configure Wine'
|
||||||
|
+ If this is the case, select the 'Copy default config'
|
||||||
|
option, below, to create a configuration file.
|
||||||
|
|
||||||
|
"
|
||||||
|
@@ -461,7 +439,7 @@
|
||||||
|
fi
|
||||||
|
|
||||||
|
BUTTONS="$BUTTONS"', Debug :2'
|
||||||
|
- BUTTONS="$BUTTONS"', Configure :4'
|
||||||
|
+ BUTTONS="$BUTTONS"', Copy default config :4'
|
||||||
|
BUTTONS="$BUTTONS"', Disable :3'
|
||||||
|
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
@ -0,0 +1,67 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# wine Allow users to run Windows(tm) applications by just clicking on them
|
||||||
|
# (or typing ./file.exe)
|
||||||
|
#
|
||||||
|
# chkconfig: 35 98 10
|
||||||
|
# description: Allow users to run Windows(tm) applications by just clicking \
|
||||||
|
# on them (or typing ./file.exe)
|
||||||
|
|
||||||
|
. /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 || :
|
||||||
|
}
|
||||||
|
|
||||||
|
stop() {
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
wine_status() {
|
||||||
|
if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
|
||||||
|
echo $"Wine binary format handlers are registered."
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
echo $"Wine binary format handlers are not registered."
|
||||||
|
return 3
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
start
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
stop
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
wine_status
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
restart)
|
||||||
|
stop
|
||||||
|
start
|
||||||
|
;;
|
||||||
|
condrestart)
|
||||||
|
if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
|
||||||
|
stop
|
||||||
|
start
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo $"Usage: $prog {start|stop|status|restart|condrestart}"
|
||||||
|
exit 1
|
||||||
|
esac
|
||||||
|
exit $RETVAL
|
||||||
|
|
||||||
@ -0,0 +1,288 @@
|
|||||||
|
%define DATE 20030911
|
||||||
|
%define with_valgrind %{?_with_valgrind:1}%{!?_with_valgrind:0}
|
||||||
|
%define with_alsa %{?_with_alsa:1}%{!?_with_alsa:0}
|
||||||
|
|
||||||
|
Summary: A Windows 16/32 bit emulator.
|
||||||
|
Name: wine
|
||||||
|
Version: 0.0
|
||||||
|
Release: 0.fdr.2.%{DATE}.rh90
|
||||||
|
Epoch: 0
|
||||||
|
Group: Applications/Emulators
|
||||||
|
License: LGPL
|
||||||
|
URL: http://www.winehq.com/
|
||||||
|
Source0: ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-%{DATE}.tar.gz
|
||||||
|
Source1: wine.init
|
||||||
|
Patch0: wine-20030408-initial.patch
|
||||||
|
Patch1: wine-20030408-kde2.patch
|
||||||
|
Patch2: wine-20030408-winelauncher.patch
|
||||||
|
Patch3: wine-20030408-defaultcfg.patch
|
||||||
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
ExclusiveArch: %{ix86}
|
||||||
|
Prereq: shadow-utils
|
||||||
|
Conflicts: kdebase < 0:2.0
|
||||||
|
Requires: cups-libs >= 0:1.1.12, openssl
|
||||||
|
# require NPTL-capable glibc
|
||||||
|
Requires: /lib/tls
|
||||||
|
Requires(pre,postun): shadow-utils
|
||||||
|
BuildRequires: docbook-utils, cups-devel >= 0:1.1.12, perl
|
||||||
|
BuildRequires: XFree86-devel, libjpeg-devel, libungif-devel, libstdc++-devel
|
||||||
|
BuildRequires: bison, flex, autoconf >= 0:2.53, arts-devel, ncurses-devel
|
||||||
|
BuildRequires: openssl-devel, sane-backends-devel
|
||||||
|
%if %{with_valgrind}
|
||||||
|
BuildRequires: valgrind-devel
|
||||||
|
%else
|
||||||
|
BuildConflicts: valgrind-devel
|
||||||
|
%endif
|
||||||
|
%if %{with_alsa}
|
||||||
|
BuildRequires: alsa-libs-devel
|
||||||
|
%else
|
||||||
|
BuildConflicts: alsa-libs-devel
|
||||||
|
%endif
|
||||||
|
Provides: libntdll.dll.so
|
||||||
|
|
||||||
|
%description
|
||||||
|
While Wine is usually thought of as a Windows(TM) emulator, the Wine
|
||||||
|
developers would prefer that users thought of Wine as a Windows
|
||||||
|
compatibility layer for UNIX. This package includes a program loader,
|
||||||
|
which allows unmodified Windows 3.1/95/NT binaries to run under Intel
|
||||||
|
Unixes. Wine does not require MS Windows, but it can use native system
|
||||||
|
.dll files if they are available.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Wine development environment.
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
Header and include files for developing applications with the Wine
|
||||||
|
Windows(TM) emulation libraries.
|
||||||
|
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n wine-%{DATE}
|
||||||
|
find . -type d -name CVS |xargs rm -rf
|
||||||
|
%patch -p1 -b .initial
|
||||||
|
%patch1 -p1 -b .kde2
|
||||||
|
%patch2 -p1 -b .wl
|
||||||
|
%patch3 -p1 -b .defcfg
|
||||||
|
|
||||||
|
|
||||||
|
%build
|
||||||
|
export CFLAGS="$RPM_OPT_FLAGS"
|
||||||
|
export CPPFLAGS="$(pkg-config openssl --cflags)" # fix ssl detection, need krb5
|
||||||
|
autoconf || autoconf-2.53
|
||||||
|
%configure \
|
||||||
|
--with-nptl \
|
||||||
|
--with-x \
|
||||||
|
--libdir=%{_libdir}/wine \
|
||||||
|
--includedir=%{_includedir}/wine \
|
||||||
|
--sysconfdir=%{_sysconfdir}/wine
|
||||||
|
|
||||||
|
|
||||||
|
make depend
|
||||||
|
make %{?_smp_mflags}
|
||||||
|
#%{__make} -C documentation doc
|
||||||
|
|
||||||
|
|
||||||
|
%install
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
%makeinstall \
|
||||||
|
includedir=%{?buildroot:%{buildroot}}%{_includedir}/wine \
|
||||||
|
libdir=%{?buildroot:%{buildroot}}%{_libdir}/wine \
|
||||||
|
sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir}/wine \
|
||||||
|
dlldir=%{?buildroot:%{buildroot}}%{_libdir}/wine/wine \
|
||||||
|
LDCONFIG=/bin/true
|
||||||
|
|
||||||
|
for i in system command "Start Menu/Programs/Startup" Profiles/Administrator Fonts \
|
||||||
|
Desktop Favorites NetHood Recent SendTo ShellNew; do
|
||||||
|
mkdir -p "$RPM_BUILD_ROOT%{_datadir}/wine-c/windows/$i"
|
||||||
|
done
|
||||||
|
mkdir -p "$RPM_BUILD_ROOT%{_datadir}/wine-c/My Documents"
|
||||||
|
mkdir -p "$RPM_BUILD_ROOT%{_datadir}/wine-c/Program Files/Common Files"
|
||||||
|
|
||||||
|
# Take care of wine and windows configuration files...
|
||||||
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/wine
|
||||||
|
mv documentation/samples/config documentation/samples/config.orig
|
||||||
|
sed "s/\"GraphicsDriver\" = .*/\"GraphicsDriver\" = \"ttydrv\"/" documentation/samples/config.orig |\
|
||||||
|
sed "s|\"Path\" = \"/c\"\$|\"Path\" = \"$RPM_BUILD_ROOT%{_datadir}/wine-c\"|" |\
|
||||||
|
sed "s|\"Path\" = \"\${HOME}\"$|\"Path\" = \"%{_builddir}/%{buildsubdir}\"|" -> documentation/samples/config
|
||||||
|
WINEPREFIX=%{_builddir}/%{buildsubdir}/documentation/samples programs/regedit/regedit winedefault.reg #> /dev/null
|
||||||
|
# Wait until wineserver finishes and closes those files
|
||||||
|
sleep 5
|
||||||
|
install -c -m 0644 documentation/samples/system.reg $RPM_BUILD_ROOT%{_sysconfdir}/wine/system.reg
|
||||||
|
install -c -m 0644 documentation/samples/user.reg $RPM_BUILD_ROOT%{_sysconfdir}/wine/user.reg
|
||||||
|
install -c -m 0644 documentation/samples/userdef.reg $RPM_BUILD_ROOT%{_sysconfdir}/wine/userdef.reg
|
||||||
|
rm -f documentation/samples/system.reg
|
||||||
|
rm -f documentation/samples/user.reg
|
||||||
|
rm -f documentation/samples/userdef.reg
|
||||||
|
|
||||||
|
sed "s|\"Path\" = \"/c\"\$|\"Path\" = \"%{_datadir}/wine-c\"|" documentation/samples/config.orig > documentation/samples/config.rh
|
||||||
|
mv documentation/samples/config.rh documentation/samples/config.orig
|
||||||
|
sed "s|\"Path\" = \"/cdrom\"\$|\"Path\" = \"/mnt/cdrom\"|" documentation/samples/config.orig > documentation/samples/config.rh
|
||||||
|
mv documentation/samples/config.rh documentation/samples/config.orig
|
||||||
|
sed "s|\"Path\" = \"/mnt/fd0\"\$|\"Path\" = \"/mnt/floppy\"|" documentation/samples/config.orig > documentation/samples/config.rh
|
||||||
|
|
||||||
|
install -c -m 0644 documentation/samples/config.rh $RPM_BUILD_ROOT%{_sysconfdir}/wine/wine.conf
|
||||||
|
rm -f documentation/samples/config
|
||||||
|
rm -f documentation/samples/config.rh
|
||||||
|
mv documentation/samples/config.orig documentation/samples/config
|
||||||
|
|
||||||
|
# Install link to windows applications replacements
|
||||||
|
ln -sf %{_libdir}/wine/wine/start.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/command/start.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/notepad.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/notepad.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/regedit.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/regedit.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/rundll32.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/rundll32.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/wcmd.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/cmd.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/control.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/control.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/winhelp.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/help.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/notepad.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/notepad.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/progman.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/progman.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/regsvr32.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/regsvr32.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/winemine.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/winmine.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/winver.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/winver.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/uninstaller.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/uninstaller.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/winhelp.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/winhelp.exe
|
||||||
|
ln -sf %{_libdir}/wine/wine/winhelp.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/winhlp32.exe
|
||||||
|
|
||||||
|
for i in shell.dll shell32.dll winsock.dll wnsock32.dll; do
|
||||||
|
touch $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/$i
|
||||||
|
done
|
||||||
|
touch $RPM_BUILD_ROOT%{_datadir}/wine-c/autoexec.bat
|
||||||
|
touch $RPM_BUILD_ROOT%{_datadir}/wine-c/config.sys
|
||||||
|
touch $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/win.ini
|
||||||
|
install -c -m 0644 documentation/samples/system.ini $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system.ini
|
||||||
|
|
||||||
|
cat >RedHat <<EOF
|
||||||
|
Wine directory structure used in Red Hat Linux:
|
||||||
|
===============================================
|
||||||
|
|
||||||
|
%{_datadir}/wine-c is the root directory (aka C: drive) wine looks for
|
||||||
|
by default. It contains (empty) C:\windows and C:\windows\system
|
||||||
|
directories, needed to operate Wine without an existing Windows installation.
|
||||||
|
|
||||||
|
If you want to use Wine with an existing Windows installation that is mounted,
|
||||||
|
for example, in /mnt/windows-c, edit /etc/wine.conf to say
|
||||||
|
|
||||||
|
[Drive C]
|
||||||
|
Path=/mnt/windows-c
|
||||||
|
Type=hd
|
||||||
|
Label=Whatever
|
||||||
|
Filesystem=win95
|
||||||
|
|
||||||
|
instead of the defaults set by installation.
|
||||||
|
|
||||||
|
If you do this, you can safely remove %{_datadir}/wine-c.
|
||||||
|
(Alternatively, just mount your Windows partition to %{_datadir}/wine-c.)
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# Allow users to launch Windows programs by just clicking on the .exe file...
|
||||||
|
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
|
||||||
|
install -c -m 755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/wine
|
||||||
|
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
|
%pre
|
||||||
|
/usr/sbin/groupadd -g 66 -r wine &>/dev/null || :
|
||||||
|
|
||||||
|
%post
|
||||||
|
if ! grep -q "^/usr/lib/wine$" /etc/ld.so.conf; then
|
||||||
|
echo "/usr/lib/wine" >>/etc/ld.so.conf
|
||||||
|
fi
|
||||||
|
/sbin/chkconfig --add wine
|
||||||
|
/sbin/chkconfig --level 2345 wine on
|
||||||
|
/sbin/service wine start &>/dev/null || :
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%preun
|
||||||
|
if test "$1" = "0"; then
|
||||||
|
/sbin/service wine stop &> /dev/null || :
|
||||||
|
/sbin/chkconfig --del wine
|
||||||
|
fi
|
||||||
|
|
||||||
|
%postun
|
||||||
|
if test "$1" = "0"; then
|
||||||
|
perl -pi -e "s,^/usr/lib/wine\n$,,g" /etc/ld.so.conf
|
||||||
|
/usr/sbin/groupdel wine &>/dev/null || :
|
||||||
|
fi
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(0775,root,wine)
|
||||||
|
%dir %{_datadir}/wine-c
|
||||||
|
%dir %{_datadir}/wine-c/windows
|
||||||
|
%dir %{_datadir}/wine-c/windows/command
|
||||||
|
%dir %{_datadir}/wine-c/windows/system
|
||||||
|
%dir "%{_datadir}/wine-c/windows/Start Menu"
|
||||||
|
%dir "%{_datadir}/wine-c/windows/Start Menu/Programs"
|
||||||
|
%dir "%{_datadir}/wine-c/windows/Start Menu/Programs/Startup"
|
||||||
|
%dir %{_datadir}/wine-c/windows/Profiles
|
||||||
|
%dir %{_datadir}/wine-c/windows/Profiles/Administrator
|
||||||
|
%dir %{_datadir}/wine-c/windows/Fonts
|
||||||
|
%dir %{_datadir}/wine-c/windows/Desktop
|
||||||
|
%dir %{_datadir}/wine-c/windows/Favorites
|
||||||
|
%dir %{_datadir}/wine-c/windows/NetHood
|
||||||
|
%dir %{_datadir}/wine-c/windows/Recent
|
||||||
|
%dir %{_datadir}/wine-c/windows/SendTo
|
||||||
|
%dir %{_datadir}/wine-c/windows/ShellNew
|
||||||
|
%dir "%{_datadir}/wine-c/My Documents"
|
||||||
|
%dir "%{_datadir}/wine-c/Program Files"
|
||||||
|
%dir "%{_datadir}/wine-c/Program Files/Common Files"
|
||||||
|
%defattr(-,root,wine,-)
|
||||||
|
%{_libdir}/wine
|
||||||
|
%{_bindir}/*
|
||||||
|
%{_mandir}/man?/*
|
||||||
|
%{_datadir}/wine-c/windows/command/*.exe
|
||||||
|
%{_datadir}/wine-c/windows/system/*.dll
|
||||||
|
%{_datadir}/wine-c/windows/system/*.exe
|
||||||
|
%{_datadir}/wine-c/windows/*.exe
|
||||||
|
%{_datadir}/aclocal/wine.m4
|
||||||
|
%config %{_datadir}/wine-c/autoexec.bat
|
||||||
|
%config %{_datadir}/wine-c/config.sys
|
||||||
|
%attr(0664, root, wine) %config %{_datadir}/wine-c/windows/win.ini
|
||||||
|
%attr(0664, root, wine) %config %{_datadir}/wine-c/windows/system.ini
|
||||||
|
%config %{_sysconfdir}/wine/*
|
||||||
|
%config %{_initrddir}/*
|
||||||
|
%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD README VERSION
|
||||||
|
%doc AUTHORS RedHat
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%doc documentation/winelib-* documentation/wine-devel* documentation/debug*
|
||||||
|
%doc documentation/patches* documentation/porting.sgml documentation/implementation.sgml
|
||||||
|
%doc documentation/HOWTO-winelib
|
||||||
|
%{_includedir}/*
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Sun Sep 28 2003 Ville Skyttä <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20030911
|
||||||
|
- Fix SSL detection (need krb5), require openssl.
|
||||||
|
- Disable ALSA by default, use "--with alsa" to enable.
|
||||||
|
- Disable valgrind by default, use "--with valgrind" to enable.
|
||||||
|
- Cosmetic improvements.
|
||||||
|
|
||||||
|
* Tue Sep 16 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030911
|
||||||
|
- update to 20030911
|
||||||
|
|
||||||
|
* Tue Aug 19 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030813
|
||||||
|
- update to 20030813
|
||||||
|
|
||||||
|
* Thu Jul 10 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030709
|
||||||
|
- update to 20030709
|
||||||
|
- add /lib/tls requirement -> only works with NTPL capable systems
|
||||||
|
|
||||||
|
* Wed Jul 02 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030618
|
||||||
|
- update to 20030618
|
||||||
|
|
||||||
|
* Thu May 22 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030508
|
||||||
|
- update to 20030508
|
||||||
|
- add buildreq's & other QA issues from #255
|
||||||
|
|
||||||
|
* Sat May 03 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030408
|
||||||
|
- package for fedora
|
||||||
|
- based on modified RH wine from 8.0 found off the net
|
||||||
|
|
||||||
Loading…
Reference in new issue