File bin86.spec.diff of Package vt.bin86

--- bin86.spec.new	2007-06-07 02:58:22.000000000 +0200
+++ bin86.spec	2007-06-07 02:48:45.000000000 +0200
@@ -10,17 +10,21 @@
 
 # norootforbuild
 
+# set the correct libdir and includedir
+%define __bcclibdir %{_libdir}/bcc
+
 Name:           bin86
-License:        Other License(s), see package
+License:        --- several copyrights ---
 Group:          Development/Languages/Other
 Autoreqprov:    on
 Version:        0.16.17
-Release:        16
+Release:        18
 Summary:        An 8086 Assembler and Linker
 URL:            http://www.cix.co.uk/~mayday/
 Source:         Dev86src-%{version}.tar.bz2
 Source1:        rpmlintrc
-Patch:          dev86-%{version}.dif
+Patch0:         dev86-%{version}.dif
+Patch1:         dev86-%{version}-x86_64_fixes.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -35,6 +39,7 @@
     Linus Torvalds <torvalds@transmeta.com>
     H.J. Lu <hjl@nynexst.com>
 
+%debug_package
 %package -n dev86
 Summary:        8086 Development Suite
 Requires:       bin86 
@@ -55,25 +60,30 @@
 
 %prep
 %setup -n dev86-%{version}
-%patch
+%patch0
+%ifarch amd64 x86_64 ia32e em64t
+%patch1
+%endif
 
 %build
-make GCCFLAG="$RPM_OPT_FLAGS -fno-strict-aliasing"
+make GCCFLAG="$RPM_OPT_FLAGS -fno-strict-aliasing" LIBDIR=%{__bcclibdir} \
+	INCLDIR=%{__bcclibdir}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DIST=$RPM_BUILD_ROOT PREFIX=/usr MANDIR=/usr/share/man
+make install DIST=$RPM_BUILD_ROOT PREFIX=/usr MANDIR=/usr/share/man \
+	LIBDIR=%{__bcclibdir} INCLDIR=%{__bcclibdir}
 make other
-make install-other DIST=$RPM_BUILD_ROOT MANDIR=/usr/share/man
+make install-other DIST=$RPM_BUILD_ROOT MANDIR=/usr/share/man \
+	LIBDIR=%{__bcclibdir} INCLDIR=%{__bcclibdir}
 mv bootblocks/README bootblocks/README.bootblocks
 mv copt/README copt/README.copt
 mv dis88/README dis88/README.dis88
 mv elksemu/README elksemu/README.elksemu
 mv unproto/README unproto/README.unproto 
 mv bin86/README bin86/README.bin86
-mkdir $RPM_BUILD_ROOT/usr/lib/bcc/kinclude
-cp -a libc/kinclude/arch $RPM_BUILD_ROOT/usr/lib/bcc/kinclude
-cp -a libc/kinclude/linuxmt $RPM_BUILD_ROOT/usr/lib/bcc/kinclude
+mkdir $RPM_BUILD_ROOT%{__bcclibdir}/kinclude
+cp -a libc/kinclude/arch $RPM_BUILD_ROOT%{__bcclibdir}/kinclude
+cp -a libc/kinclude/linuxmt $RPM_BUILD_ROOT%{__bcclibdir}/kinclude
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,22 +103,36 @@
 %defattr(-,root,root)
 %doc MAGIC Contributors bootblocks/README.bootblocks copt/README.copt
 %doc dis88/README.dis88
-%doc elksemu/README.elksemu unproto/README.unproto bin86/README-0.4
+%ifnarch amd64 x86_64 ia32e em64t
+%doc elksemu/README.elksemu
+%endif
+%doc unproto/README.unproto bin86/README-0.4
 %doc bin86/README.bin86 bin86/ChangeLog
+%ifnarch amd64 x86_64 ia32e em64t
 /usr/bin/elksemu
+%endif
 /usr/bin/ar86
 /usr/bin/bcc
 /usr/bin/dis86
 /usr/bin/makeboot
-/usr/lib/bcc
+%{__bcclibdir}
 %doc /usr/share/man/man1/bcc.1.gz
 %doc /usr/share/man/man1/dis86.1.gz
 %doc /usr/share/man/man1/elks.1.gz
 %doc /usr/share/man/man1/elksemu.1.gz
 
 %changelog
+* Thu Jun 07 2007 - Marcus Hüwe <suse-tux@gmx.de>
+- added my old %%changelog entry to the correct place
+- update my spec patch to fit to the latest version
 * Sat May 26 2007 - ro@suse.de
 - rpmlintrc: dev86 is a devel package, accept devel files there
+* Mon Apr 09 2007 Marcus Hüwe <suse-tux@gmx.de>
+- disabled elksemu on x86_64 (it complains about missing sys/vm86.h which is
+  not available on x86_64)
+- other x86_64 fixes
+- fixed spec for building on x86_64 (introduced %%{__bcclibdir} variable)
+- removed "rm -rf \$RPM_BUILD_ROOT" from the %%install section
 * Sun Jan 21 2007 - ro@suse.de
 - update to 0.16.17 (thanks to rschiele)
   - Sorry forgot to flip this back: perror and strerror are back to using
openSUSE Build Service is sponsored by