OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Peter Smej
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Jan-2003 13:20:47
Branch: HEAD Handle: 2003011712204700
Modified files:
openpkg-src/bochs bochs.spec
Log:
Changed bochs start script and installation of font file
Summary:
Revision Changes Path
1.12 +8 -2 openpkg-src/bochs/bochs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 bochs.spec
--- openpkg-src/bochs/bochs.spec 17 Jan 2003 08:23:29 -0000 1.11
+++ openpkg-src/bochs/bochs.spec 17 Jan 2003 12:20:47 -0000 1.12
@@ -88,7 +88,7 @@
--enable-all-optimizations \
--enable-cdrom \
--enable-ne2000 \
- --disable-shared
+ --disable-shared \
# build the sources
%{l_make} %{l_mflags -O}
@@ -117,6 +117,8 @@
( cd $RPM_BUILD_ROOT%{l_prefix}/share/bochs
rm -f install-x11-fonts test-x11-fonts
mkdir fonts; mv vga.pcf fonts/
+ %{l_gzip} -9 \
+ $RPM_BUILD_ROOT%{l_prefix}/share/bochs/fonts/vga.pcf
x11_bindir=`%{l_prefix}/etc/rc --query x11_bindir`
$x11_bindir/mkfontdir fonts
)
@@ -126,6 +128,10 @@
mv $RPM_BUILD_ROOT%{l_prefix}/bin/bochs \
$RPM_BUILD_ROOT%{l_prefix}/libexec/bochs/
( echo "#!/bin/sh"
+ echo "if [ \"\$DISPLAY.\" = \".\" ]; then"
+ echo " echo \"DISPLAY not set\""
+ echo "exit 1"
+ echo "fi"
echo "xset fp+ %{l_prefix}/share/bochs/fonts"
echo "exec %{l_prefix}/libexec/bochs/bochs \${1+\"\$@\"}"
) >$RPM_BUILD_ROOT%{l_prefix}/bin/bochs
@@ -151,7 +157,7 @@
%files -f files
%clean
- rm -rf $RPM_BUILD_ROOT
+# rm -rf $RPM_BUILD_ROOT
%post
if [ $1 -eq 1 ]; then
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
