rpms/bochs/devel .cvsignore, 1.12, 1.13 bochs.spec, 1.34, 1.35 sources, 1.12, 1.13 bochs-config.patch, 1.3, NONE

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/bochs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29055

Modified Files:
	.cvsignore bochs.spec sources 
Removed Files:
	bochs-config.patch 
Log Message:
* Thu Dec 18 2008 Hans de Goede <hdegoede at redhat.com> 2.3.7-2
- Remove dlxlinux sub package, we cannot build this from source (rh 476878)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	9 Jun 2008 21:33:14 -0000	1.12
+++ .cvsignore	18 Dec 2008 11:11:53 -0000	1.13
@@ -1,2 +1 @@
 bochs-2.3.7.tar.gz
-dlxlinux4.tar.gz


Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- bochs.spec	12 Jun 2008 19:08:45 -0000	1.34
+++ bochs.spec	18 Dec 2008 11:11:53 -0000	1.35
@@ -1,21 +1,19 @@
 Name:           bochs
 Version:        2.3.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPLv2+
 URL:            http://bochs.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        http://bochs.sourceforge.net/guestos/dlxlinux4.tar.gz
 Patch0:         %{name}-nonet-build.patch
-Patch1:         %{name}-config.patch
-Patch2:         %{name}-wx28.patch
-Patch3:         bochs-2.3.6-gcc43.patch
+Patch1:         %{name}-wx28.patch
+Patch2:         bochs-2.3.6-gcc43.patch
 # from upstream CVS
-Patch4:         bochs-2.3.7-3dnow-compile-fix.patch
+Patch3:         bochs-2.3.7-3dnow-compile-fix.patch
 # submitted upstream:
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1992322&group_id=12580&atid=312580
-Patch5:         bochs-2.3.7-big-endian.patch
+Patch4:         bochs-2.3.7-big-endian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libXt-devel libXpm-devel SDL-devel readline-devel byacc
 BuildRequires:  docbook-utils
@@ -49,27 +47,13 @@
 inside the emulator can be debugged with gdb.
 
 
-%package        dlxlinux
-Summary:        DLX Linux hard disk image for Bochs
-Group:          Applications/Emulators
-Requires:       %{name} >= 2.0
-
-%description    dlxlinux
-DLX is a version of Linux which was small enough to distribute along
-with the Bochs Windows binary release.  Because of its small size, a
-limited number of linux commands are available.  The official DLX site
-is at <http://www.wu-wien.ac.at/usr/h93/h9301726/dlx.html>.  DLX was
-created by Erich and Hannes Boehm.
-
-
 %prep
 %setup -q
 %patch0 -p0 -z .nonet
-%patch2 -p1 -z .wx28
-%patch3 -p1 -z .gcc43
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1
-cp -p %{SOURCE1} .
 # Fix up some man page paths.
 sed -i \
   -e 's|/usr/local/share/doc/bochs/|%{_docdir}/%{name}-%{version}/|' \
@@ -121,17 +105,13 @@
 %configure $CONFIGURE_FLAGS
 make %{?_smp_mflags}
 
-make unpack_dlx
-# This needs to be done after "make unpack_dlx".
-patch -p0 < %{PATCH1}
-sed -i -e 's/\r//' dlxlinux/readme.txt dlxlinux/bochsrc.txt
-
 
 %install
 rm -rf $RPM_BUILD_ROOT _installed-docs
-make install install_dlx DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 install -m 755 bochs-debugger bochs-gdb $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_docdir}/bochs _installed-docs
+rm $RPM_BUILD_ROOT%{_mandir}/man1/bochs-dlx.1*
 
 
 %clean
@@ -162,14 +142,11 @@
 %defattr(-,root,root,-)
 %{_bindir}/bochs-gdb
 
-%files dlxlinux
-%defattr(-,root,root,-)
-%{_bindir}/bochs-dlx
-%{_mandir}/man1/bochs-dlx.1*
-%{_datadir}/bochs/dlxlinux/
-
 
 %changelog
+* Thu Dec 18 2008 Hans de Goede <hdegoede at redhat.com> 2.3.7-2
+- Remove dlxlinux sub package, we cannot build this from source (rh 476878)
+
 * Mon Jun  9 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.7-1
 - New upstream release 2.3.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Jun 2008 21:33:15 -0000	1.12
+++ sources	18 Dec 2008 11:11:53 -0000	1.13
@@ -1,2 +1 @@
 a2e5f922505bf16cabd36bb9d571a2c4  bochs-2.3.7.tar.gz
-379269841ae5aef95e4ec56d6d186532  dlxlinux4.tar.gz


--- bochs-config.patch DELETED ---