OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 18-Jul-2003 00:25:09
Branch: HEAD Handle: 2003071723250702
Modified files:
openpkg-src/wine wine.spec winesetup.sh
openpkg-web news.txt
Log:
various bugfixes, cleanups and enhancements
Summary:
Revision Changes Path
1.4 +7 -16 openpkg-src/wine/wine.spec
1.2 +48 -13 openpkg-src/wine/winesetup.sh
1.5625 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wine/wine.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 wine.spec
--- openpkg-src/wine/wine.spec 17 Jul 2003 21:50:14 -0000 1.3
+++ openpkg-src/wine/wine.spec 17 Jul 2003 22:25:09 -0000 1.4
@@ -33,7 +33,7 @@
Group: X11
License: LGPL
Version: 20030709
-Release: 20030717
+Release: 20030718
# list of sources
Source0:
http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-%{version}.tar.gz
@@ -43,8 +43,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, X11, xpm, perl, gcc, make, flex, bison
-PreReq: OpenPKG, openpkg >= 20030103, X11, xpm, perl
+BuildPreReq: OpenPKG, openpkg >= 20030117, X11, xpm, perl, gcc, make, flex, bison
+PreReq: OpenPKG, openpkg >= 20030117, X11, xpm, perl
AutoReq: no
AutoReqProv: no
@@ -98,14 +98,9 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/wine
%{l_shtool} install -c -m 644 \
- documentation/samples/* \
+ winedefault.reg documentation/samples/* \
$RPM_BUILD_ROOT%{l_prefix}/share/wine/
- # install default registry
- %{l_shtool} install -c -m 644 \
- winedefault.reg \
- $RPM_BUILD_ROOT%{l_prefix}/lib/wine/
-
# post-adjust installation
mv $RPM_BUILD_ROOT%{l_prefix}/bin/function_grep.pl \
$RPM_BUILD_ROOT%{l_prefix}/bin/function_grep
@@ -126,15 +121,11 @@
echo "export LD_LIBRARY_PATH"
echo "exec %{l_prefix}/libexec/wine/$prog \${1+\"[EMAIL PROTECTED]"}"
) >$prog.sh && %{l_shtool} install -c -m 755 \
- $prog.sh $RPM_BUILD_ROOT%{l_prefix}/libexec/wine/$prog
+ $prog.sh $RPM_BUILD_ROOT%{l_prefix}/bin/$prog
done
- # install a utilities for setting up $HOME/.wine
- %{l_shtool} install -c -m 755 \
- -e 's;^\(BINDIST\)=no;\1=yes;' \
- tools/wineinstall \
- $RPM_BUILD_ROOT%{l_prefix}/bin/wineinstall
- %{l_shtool} install -c -m 755 \
+ # install a utility for setting up $HOME/.wine
+ %{l_shtool} install -c -m 755 %{l_value -s l_prefix} \
%{SOURCE winesetup.sh} \
$RPM_BUILD_ROOT%{l_prefix}/bin/winesetup
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wine/winesetup.sh
============================================================================
$ cvs diff -u -r1.1 -r1.2 winesetup.sh
--- openpkg-src/wine/winesetup.sh 17 Jul 2003 20:53:45 -0000 1.1
+++ openpkg-src/wine/winesetup.sh 17 Jul 2003 22:25:09 -0000 1.2
@@ -3,6 +3,7 @@
## winesetup -- Wine setup utility for users
##
+# configuration
l_prefix="@l_prefix@"
# create important directory structure under $HOME/.wine
@@ -11,11 +12,15 @@
"$HOME/.wine" \
"$HOME/.wine/c_drive" \
"$HOME/.wine/c_drive/Windows" \
+ "$HOME/.wine/c_drive/Windows/Command" \
"$HOME/.wine/c_drive/Windows/Fonts" \
"$HOME/.wine/c_drive/Windows/Start Menu" \
"$HOME/.wine/c_drive/Windows/Start Menu/Programs" \
+ "$HOME/.wine/c_drive/Windows/Start Menu/Programs/Startup" \
"$HOME/.wine/c_drive/Windows/System" \
"$HOME/.wine/c_drive/Windows/System32" \
+ "$HOME/.wine/c_drive/Windows/Profiles" \
+ "$HOME/.wine/c_drive/Windows/Profiles/Administrator" \
"$HOME/.wine/c_drive/Windows/Temp" \
"$HOME/.wine/c_drive/Program Files" \
"$HOME/.wine/c_drive/Program Files/Common Files"; \
@@ -26,21 +31,51 @@
fi
done
-# install important configuration files into $HOME/.wine
-if [ ! -f "$HOME/.wine/system.ini" ]; then
- echo "++ creating file \"$HOME/.wine/system.ini\""
- cp $l_prefix/share/wine/system.ini $HOME/.wine/system.ini
+# install important configuration file
+if [ ! -f "$HOME/.wine/config" ]; then
+ echo "++ creating file \"$HOME/.wine/config\""
+ sed -e "s;\"/c\";\"$HOME/.wine/c_drive\";" \
+ <$l_prefix/share/wine/config >$HOME/.wine/config
fi
-if [ ! -f "$HOME/.wine/win.ini" ]; then
- echo "++ creating file \"$HOME/.wine/win.ini\""
- cp $l_prefix/share/wine/win.ini $HOME/.wine/win.ini
+
+# install important system files
+if [ ! -f "$HOME/.wine/c_drive/Windows/system.ini" ]; then
+ echo "++ creating file \"$HOME/.wine/c_drive/Windows/system.ini\""
+ cp $l_prefix/share/wine/system.ini $HOME/.wine/c_drive/Windows/system.ini
fi
-if [ ! -f "$HOME/.wine/generic.ppd" ]; then
- echo "++ creating file \"$HOME/.wine/generic.ppd\""
- cp $l_prefix/share/wine/generic.ppd $HOME/.wine/generic.ppd
+if [ ! -f "$HOME/.wine/c_drive/Windows/win.ini" ]; then
+ echo "++ creating file \"$HOME/.wine/c_drive/Windows/win.ini\""
+ cp $l_prefix/share/wine/win.ini $HOME/.wine/c_drive/Windows/win.ini
fi
-if [ ! -f "$HOME/.wine/config" ]; then
- echo "++ creating file \"$HOME/.wine/config\""
- cp $l_prefix/share/wine/config $HOME/.wine/config
+if [ ! -f "$HOME/.wine/c_drive/Windows/generic.ppd" ]; then
+ echo "++ creating file \"$HOME/.wine/c_drive/Windows/generic.ppd\""
+ cp $l_prefix/share/wine/generic.ppd $HOME/.wine/c_drive/Windows/generic.ppd
fi
+
+# install application links
+link_app () {
+ if [ ! -f $2 ]; then
+ echo "++ installing application \"$2\""
+ ln -s $l_prefix/lib/wine/$1.exe.so $2
+ fi
+}
+link_app start $HOME/.wine/c_drive/Windows/command/start.exe
+link_app notepad $HOME/.wine/c_drive/Windows/notepad.exe
+link_app regedit $HOME/.wine/c_drive/Windows/regedit.exe
+link_app rundll32 $HOME/.wine/c_drive/Windows/rundll32.exe
+link_app wcmd $HOME/.wine/c_drive/Windows/System/wcmd.exe
+link_app control $HOME/.wine/c_drive/Windows/System/control.exe
+link_app winhelp $HOME/.wine/c_drive/Windows/System/help.exe
+link_app notepad $HOME/.wine/c_drive/Windows/System/notepad.exe
+link_app progman $HOME/.wine/c_drive/Windows/System/progman.exe
+link_app regsvr32 $HOME/.wine/c_drive/Windows/System/regsvr32.exe
+link_app winemine $HOME/.wine/c_drive/Windows/System/winmine.exe
+link_app winver $HOME/.wine/c_drive/Windows/System/winver.exe
+link_app uninstaller $HOME/.wine/c_drive/Windows/uninstall.exe
+link_app winhelp $HOME/.wine/c_drive/Windows/winhelp.exe
+link_app winhelp $HOME/.wine/c_drive/Windows/winhlp32.exe
+
+# install default registry entries
+echo "++ installing default registry"
+$l_prefix/bin/regedit $l_prefix/share/wine/winedefault.reg
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5624 -r1.5625 news.txt
--- openpkg-web/news.txt 17 Jul 2003 22:11:51 -0000 1.5624
+++ openpkg-web/news.txt 17 Jul 2003 22:25:07 -0000 1.5625
@@ -1,3 +1,4 @@
+18-Jul-2003: Upgraded package: P<wine-20030709-20030718>
18-Jul-2003: Upgraded package: P<cvs-1.12.1-20030718>
18-Jul-2003: Upgraded package: P<postfix-2.0.13-20030718>
17-Jul-2003: Upgraded package: P<wine-20030709-20030717>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
