X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bcc.spec;h=c7f4ef5b7e58e4838135163dcf5d4543a81afb83;hb=a12a1330ed0aac117d41c47de493fa8f3a22734a;hp=34daa46ef56b629835e73407474840b7b4a5bc38;hpb=c34bdd5e5c67af8656e4e5f8b1464018f0796d39;p=packages%2Fbcc.git

diff --git a/bcc.spec b/bcc.spec
index 34daa46..c7f4ef5 100644
--- a/bcc.spec
+++ b/bcc.spec
@@ -1,18 +1,30 @@
 Summary:	Bruce's C compiler
-Summary(pl):	Kompiler C Bruce'a
+Summary(pl.UTF-8):	Kompilator C Bruce'a
 Name:		bcc
-Version:	0.16.0
-Release:	3
+Version:	0.16.19
+Release:	2
 License:	GPL
 Group:		Development/Languages
-Source0:	http://www.cix.co.uk/~mayday/Dev86src-%{version}.tar.gz
+Source0:	http://www.debath.co.uk/dev86/Dev86src-%{version}.tar.gz
+# Source0-md5:	442e98e1afa23fe00d40c5a996385942
 Patch0:		Dev86src-noroot.patch
-Patch1:		Dev86src-nobcc.patch
-Patch2:		Dev86src-bccpaths.patch
-Patch3:		Dev86src-opt.patch
-Buildroot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-ExclusiveArch:	%{ix86}
-Requires:	bin86
+Patch1:		Dev86src-opt.patch
+Patch2:		dev86-0.16.17-fortify.patch
+Patch3:		dev86-pic.patch
+Patch4:		dev86-64bit.patch
+Patch5:		dev86-noelks.patch
+Patch6:		dev86-nostrip.patch
+Patch7:		dev86-print-overflow.patch
+Patch8:		dev86-make.patch
+Patch9:		dev86-copt.patch
+Patch10:	dev86-format.patch
+URL:		http://www.debath.co.uk/
+Requires:	bin86 >= %{version}
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+# don't try to strip Linux-8086 objects
+%define		_noautostrip	.*%{_libdir}/bcc/.*\\.[ao]
+
 
 %description
 Bcc is a simple C compiler that produces 8086 assembler, in addition
@@ -20,21 +32,40 @@ compiler compile time options allow 80386 or 6809 versions. The
 compiler understands traditional K&R C with just the restriction that
 bit fields are mapped to one of the other integer types.
 
-%description -l pl
-Bcc jest prostym kompilatorem C produkuj±cym pliki asemblerowe 8086,
+%description -l pl.UTF-8
+Bcc jest prostym kompilatorem C tworzącym pliki asemblerowe 8086,
 a dodatkowo pozwala na wybranie wersji 80386 lub 6809. Kompilator
-rozumie tradycyjne K&R C z takim ograniczeniem, ¿e pola bitowe
-s± odwzorowywane do jednego z innych typów ca³kowitych.
+rozumie tradycyjne C K&R z takim ograniczeniem, że pola bitowe
+są odwzorowywane do jednego z innych typów całkowitych.
 
 %prep
 %setup -q -n dev86-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+%patch3 -p0
+%if "%{_lib}" == "lib64"
+%patch4 -p1
+%endif
+%ifnarch %{ix86}
+%patch5 -p1
+%endif
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+
+mv -f bootblocks/README README.bootblocks
+mv -f copt/README README.copt
+mv -f dis88/README README.dis88
+mv -f elksemu/README README.elksemu
+mv -f unproto/README README.unproto
 
 %build
-CC="%{__cc}" %{__make} OPT="%{rpmcflags}" <<!FooBar!
+CC="%{__cc}" \
+%{__make} -j1 all other \
+	OPT="%{rpmcppflags} %{rpmcflags}" <<!FooBar!
 5
 quit
 !FooBar!
@@ -42,52 +73,57 @@ quit
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DIST=$RPM_BUILD_ROOT
+%{__make} -j1 install-all \
+	DIST=$RPM_BUILD_ROOT \
+	LIBDIR=%{_libdir}/bcc \
+	INCLDIR=%{_libdir}/bcc \
+	LOCALPREFIX=%{_prefix} \
+	MANDIR=%{_mandir}
 
-install $RPM_BUILD_ROOT/lib/elksemu $RPM_BUILD_ROOT%{_bindir}
-#rm -rf $RPM_BUILD_ROOT/lib/
 cp -R libc/kinclude $RPM_BUILD_ROOT%{_libdir}/bcc
 
 ln -sf objdump86 $RPM_BUILD_ROOT%{_bindir}/nm86
 ln -sf objdump86 $RPM_BUILD_ROOT%{_bindir}/size86
 
-# move header files out of %{_includedir} and into %{_libdir}/bcc/include
-mv -f $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{_libdir}/bcc
+# these are separated in bin86 package
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{as86,ld86}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{as,ld}86.1*
 
-# move man pages where they belong
-install -d $RPM_BUILD_ROOT%{_mandir}
-mv -f $RPM_BUILD_ROOT/usr/man/* $RPM_BUILD_ROOT%{_mandir}
-
-gzip -9nf README MAGIC Contributors bootblocks/README copt/README \
-	dis88/README elksemu/README unproto/README bin86/README-0.4 \
-	bin86/README bin86/ChangeLog
+%ifnarch %{ix86}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/elks*.1
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz */*.gz
-%dir %{_libdir}/bcc
-%dir %{_libdir}/bcc/i86
-%dir %{_libdir}/bcc/i386
-%dir %{_libdir}/bcc/include
-%dir %{_libdir}/bcc/kinclude
+%doc Changes Contributors README*
+%attr(755,root,root) %{_bindir}/ar86
 %attr(755,root,root) %{_bindir}/bcc
-#%attr(755,root,root) %{_bindir}/as86
-%attr(755,root,root) %{_bindir}/as86_encap
-#%attr(755,root,root) %{_bindir}/ld86
-%attr(755,root,root) %{_bindir}/objdump86
+%attr(755,root,root) %{_bindir}/dis86
+%ifarch %{ix86}
+%attr(755,root,root) %{_bindir}/elksemu
+%endif
+%attr(755,root,root) %{_bindir}/makeboot
 %attr(755,root,root) %{_bindir}/nm86
+%attr(755,root,root) %{_bindir}/objdump86
 %attr(755,root,root) %{_bindir}/size86
+%dir %{_libdir}/bcc
+%attr(755,root,root) %{_libdir}/bcc/as86_encap
 %attr(755,root,root) %{_libdir}/bcc/bcc-cc1
+%attr(755,root,root) %{_libdir}/bcc/bcc-cpp
 %attr(755,root,root) %{_libdir}/bcc/copt
 %attr(755,root,root) %{_libdir}/bcc/unproto
-%{_libdir}/bcc/i86/*
-%{_libdir}/bcc/i386/*
-%{_libdir}/liberror.txt
-%{_libdir}/bcc/include/*
-%{_libdir}/bcc/kinclude/*
-%attr(755,root,root) %{_bindir}/elksemu
-%{_mandir}/man1/*
+%{_libdir}/bcc/i386
+%{_libdir}/bcc/include
+%{_libdir}/bcc/kinclude
+%{_libdir}/bcc/crt*.o
+%{_libdir}/bcc/lib*.a
+%{_libdir}/bcc/rules.*
+%{_mandir}/man1/bcc.1*
+%{_mandir}/man1/dis86.1*
+%ifarch %{ix86}
+%{_mandir}/man1/elks.1*
+%{_mandir}/man1/elksemu.1*
+%endif