diff --git a/Dev86src-0.16.17.tar.bz2 b/Dev86src-0.16.17.tar.bz2 deleted file mode 100644 index 6f481f6..0000000 --- a/Dev86src-0.16.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16adc77745f4c3d1b3241d14dbe6f6002c4448e37297e6664b42533f8f08de89 -size 573492 diff --git a/Dev86src-0.16.17.tar.gz b/Dev86src-0.16.17.tar.gz new file mode 100644 index 0000000..8317bb6 --- /dev/null +++ b/Dev86src-0.16.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52ed4980c0e4b68d2624aadb0ceb0339cb3fd8dd7c2175419d4f77a451846cbe +size 703028 diff --git a/bin86.changes b/bin86.changes index f01ecf6..dd59f31 100644 --- a/bin86.changes +++ b/bin86.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 28 08:45:12 UTC 2015 - mpluskal@suse.com + +- Update project url +- Use url for source +- Cleanup spec file with spec-cleaner + ------------------------------------------------------------------- Thu Jul 31 12:37:41 UTC 2014 - dimstar@opensuse.org diff --git a/bin86.spec b/bin86.spec index 42c38ae..601e3d0 100644 --- a/bin86.spec +++ b/bin86.spec @@ -1,7 +1,7 @@ # # spec file for package bin86 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,35 +17,26 @@ Name: bin86 -ExclusiveArch: %ix86 x86_64 Version: 0.16.17 Release: 0 Summary: An 8086 Assembler and Linker License: GPL-2.0+ Group: Development/Languages/Other -Url: http://www.cix.co.uk/~mayday/ -Source: Dev86src-%{version}.tar.bz2 +Url: http://v3.sk/~lkundrak/dev86/ +Source0: http://v3.sk/~lkundrak/dev86/archive/Dev86src-%{version}.tar.gz Source1: bin86-rpmlintrc -Patch: dev86-%{version}.dif +Patch0: dev86-%{version}.dif Patch2: dev86-noelks.patch Patch3: dev86-x86_64.patch -%if 0%suse_version > 1020 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: %ix86 x86_64 +%if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description An 8086 assembler and linker. - - -Authors: --------- - Robert de Bath - Bruce Evans - Linus Torvalds - H.J. Lu - %package -n dev86 Summary: 8086 Development Suite Group: Development/Languages/Other @@ -55,58 +46,45 @@ Requires: bin86 This package contains tools for generating Elks/8086 programs and the Elksemu for execution of these programs in Linux. - - -Authors: --------- - Robert de Bath - Bruce Evans - Linus Torvalds - H.J. Lu - %prep -%setup -n dev86-%{version} -%patch +%setup -q -n dev86-%{version} +%patch0 %patch2 -p1 -b .noelks %ifarch x86_64 %patch3 -p1 -b .x86_64 %endif %build -make GCCFLAG="$RPM_OPT_FLAGS -fno-strict-aliasing" +make GCCFLAG="%{optflags} -fno-strict-aliasing" %install -rm -rf $RPM_BUILD_ROOT -make install DIST=$RPM_BUILD_ROOT PREFIX=/usr MANDIR=/usr/share/man \ - LIBDIR=%_libdir/bcc \ - INCLDIR=%_libdir/bcc +make install DIST=%{buildroot} PREFIX=/usr MANDIR=%{_mandir} \ + LIBDIR=%{_libdir}/bcc \ + INCLDIR=%{_libdir}/bcc make other -make install-other DIST=$RPM_BUILD_ROOT MANDIR=/usr/share/man +make install-other DIST=%{buildroot} MANDIR=%{_datadir}/man mv bootblocks/README bootblocks/README.bootblocks mv copt/README copt/README.copt mv dis88/README dis88/README.dis88 -mv unproto/README unproto/README.unproto +mv unproto/README unproto/README.unproto mv bin86/README bin86/README.bin86 -mkdir $RPM_BUILD_ROOT/%_libdir/bcc/kinclude -cp -a libc/kinclude/arch $RPM_BUILD_ROOT/%_libdir/bcc/kinclude -cp -a libc/kinclude/linuxmt $RPM_BUILD_ROOT/%_libdir/bcc/kinclude -%if 0%suse_version > 1020 -%fdupes %buildroot +mkdir %{buildroot}/%{_libdir}/bcc/kinclude +cp -a libc/kinclude/arch %{buildroot}/%{_libdir}/bcc/kinclude +cp -a libc/kinclude/linuxmt %{buildroot}/%{_libdir}/bcc/kinclude +%if 0%{?suse_version} > 1020 +%fdupes %{buildroot} %endif -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc README -/usr/bin/as86 -/usr/bin/ld86 -/usr/bin/nm86 -/usr/bin/objdump86 -/usr/bin/size86 -%doc /usr/share/man/man1/as86.1.gz -%doc /usr/share/man/man1/ld86.1.gz +%{_bindir}/as86 +%{_bindir}/ld86 +%{_bindir}/nm86 +%{_bindir}/objdump86 +%{_bindir}/size86 +%doc %{_mandir}/man1/as86.1.gz +%doc %{_mandir}/man1/ld86.1.gz %files -n dev86 %defattr(-,root,root) @@ -114,14 +92,14 @@ rm -rf $RPM_BUILD_ROOT %doc dis88/README.dis88 %doc unproto/README.unproto bin86/README-0.4 %doc bin86/README.bin86 bin86/ChangeLog -/usr/bin/ar86 -/usr/bin/bcc -/usr/bin/dis86 -/usr/bin/makeboot -%_libdir/bcc -%doc /usr/share/man/man1/bcc.1.gz -%doc /usr/share/man/man1/dis86.1.gz -%exclude /usr/share/man/man1/elks.1.gz -%exclude /usr/share/man/man1/elksemu.1.gz +%{_bindir}/ar86 +%{_bindir}/bcc +%{_bindir}/dis86 +%{_bindir}/makeboot +%{_libdir}/bcc +%doc %{_mandir}/man1/bcc.1.gz +%doc %{_mandir}/man1/dis86.1.gz +%exclude %{_mandir}/man1/elks.1.gz +%exclude %{_mandir}/man1/elksemu.1.gz %changelog