- 1.2.1

- changes in %install and %files
- added man pages and more docs

Changed files:
    bochs.spec -> 1.8

diff --git a/bochs.spec b/bochs.spec
index a6ba37a8c17a6fcb1bc9705e3eac49876964dc9a..e01bd2a246835376cf2bec5cf5bc04894f828cf1 100644 (file)
--- a/bochs.spec
+++ b/bochs.spec
@@ -1,7 +1,7 @@
 Summary:       Portable x86 PC Emulator
 Summary(pl):   Przeno¶ny emulator x86 PC
 Name:          bochs
 Summary:       Portable x86 PC Emulator
 Summary(pl):   Przeno¶ny emulator x86 PC
 Name:          bochs

-Version:       1.1.2
+Version:       1.2.1

 Release:       1
 License:       GPL
 Group:         Applications/Emulators
 Release:       1
 License:       GPL
 Group:         Applications/Emulators


@@ -46,14 +46,18 @@ cd ..
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-install -d $RPM_BUILD_ROOT/{%{_bindir},%{_datadir}/bochs/bios,%{_datadir}/fonts/misc}
-install bochs $RPM_BUILD_ROOT/%{_bindir}
-install bios/BIOS-bochs-990925a bios/VGABIOS-elpin-2.40 $RPM_BUILD_ROOT%{_datadir}/bochs/bios
+install -d $RPM_BUILD_ROOT/{%{_bindir},%{_datadir}/bochs/bios,%{_datadir}/fonts/misc,%{_datadir}/man/man1}
+install bochs install-x11-fonts bximage $RPM_BUILD_ROOT/%{_bindir}
+install bios/BIOS-bochs-latest* bios/VGABIOS-elpin-2.40 $RPM_BUILD_ROOT%{_datadir}/bochs/bios
+install doc/man/* $RPM_BUILD_ROOT%{_datadir}/man/man1
+

 mv -f .bochsrc .brc
 echo "Example .bochrc file - put it into selected directory and modify" \
      "path to images" >.bochsrc
 sed -e 's#bios#%{_datadir}/bochs/bios#g' <.brc >>.bochsrc
 mv -f .bochsrc .brc
 echo "Example .bochrc file - put it into selected directory and modify" \
      "path to images" >.bochsrc
 sed -e 's#bios#%{_datadir}/bochs/bios#g' <.brc >>.bochsrc

-gzip -9nf docs-html/* bios/VGABIOS-elpin-LICENSE .bochsrc font/*.pcf
+
+gzip -9nf docs-html/* bios/VGABIOS-elpin-LICENSE .bochsrc font/*.pcf CHANGES TESTFORM.txt
+

 install font/*.pcf* $RPM_BUILD_ROOT%{_datadir}/fonts/misc
 
 %clean
 install font/*.pcf* $RPM_BUILD_ROOT%{_datadir}/fonts/misc
 
 %clean


@@ -72,8 +76,9 @@ killall -USR1 xfs > /dev/null 2>&1 ||:
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc docs-html/* bios/VGABIOS-elpin-LICENSE* .bochsrc*
-%attr(755,root,root) %{_bindir}/bochs
+%doc docs-html/* bios/VGABIOS-elpin-LICENSE* .bochsrc* *.gz
+%attr(755,root,root) %{_bindir}/*

 %dir %{_datadir}/bochs
 %{_datadir}/bochs/*
 %{_datadir}/fonts/misc/*.pcf*
 %dir %{_datadir}/bochs
 %{_datadir}/bochs/*
 %{_datadir}/fonts/misc/*.pcf*

+%{_datadir}/man/man1/*