Преглед на файлове

Changed bochs start script and installation of font file

Peter Smej преди 23 години
родител
ревизия
f6fa2a5ed4
променени са 1 файла, в които са добавени 8 реда и са изтрити 2 реда
  1. 8 2
      bochs/bochs.spec

+ 8 - 2
bochs/bochs.spec

@@ -88,7 +88,7 @@ AutoReqProv:  no
         --enable-all-optimizations \
         --enable-cdrom \
         --enable-ne2000 \
-        --disable-shared
+        --disable-shared \
 
     #   build the sources
     %{l_make} %{l_mflags -O}
@@ -117,6 +117,8 @@ AutoReqProv:  no
     ( 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 @@ AutoReqProv:  no
     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 @@ AutoReqProv:  no
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT
+#    rm -rf $RPM_BUILD_ROOT
 
 %post
     if [ $1 -eq 1 ]; then