From eb6d07baa0bb4f797a15916169264fa9ac0fb6839372bb491bed61165817a0d8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 12 Jan 2008 02:03:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nasm?expand=0&rev=3 --- nasm-0.98.39.tar.bz2 | 3 -- nasm-2.01rc2.tar.bz2 | 3 ++ nasm-array_too_small.patch | 11 +++++ nasm-codecleanup.patch | 11 +++++ nasm.changes | 45 ++++++++++++++++++ nasm.spec | 94 ++++++++++++++++++++++++++++++++------ 6 files changed, 150 insertions(+), 17 deletions(-) delete mode 100644 nasm-0.98.39.tar.bz2 create mode 100644 nasm-2.01rc2.tar.bz2 create mode 100644 nasm-array_too_small.patch create mode 100644 nasm-codecleanup.patch diff --git a/nasm-0.98.39.tar.bz2 b/nasm-0.98.39.tar.bz2 deleted file mode 100644 index 5b809ed..0000000 --- a/nasm-0.98.39.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7865f74acac6b7dccb58eda9164a86da40968eea8aa650926594e0083eaaed77 -size 543976 diff --git a/nasm-2.01rc2.tar.bz2 b/nasm-2.01rc2.tar.bz2 new file mode 100644 index 0000000..7411751 --- /dev/null +++ b/nasm-2.01rc2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ad60798352c4e9aca772a7ab9f2dd6968bce915bd161431ab4cb70e089a2b81 +size 721627 diff --git a/nasm-array_too_small.patch b/nasm-array_too_small.patch new file mode 100644 index 0000000..98027b3 --- /dev/null +++ b/nasm-array_too_small.patch @@ -0,0 +1,11 @@ +--- listing.c ++++ listing.c +@@ -220,7 +220,7 @@ + { + uint64_t d = *(int64_t *)data; + char q[19]; +- uint8_t p[4], *r = p; ++ uint8_t p[8], *r = p; + q[0] = '('; + q[17] = ')'; + q[18] = '\0'; diff --git a/nasm-codecleanup.patch b/nasm-codecleanup.patch new file mode 100644 index 0000000..f00bb00 --- /dev/null +++ b/nasm-codecleanup.patch @@ -0,0 +1,11 @@ +--- rdoff/rdx.c ++++ rdoff/rdx.c +@@ -51,7 +51,7 @@ + exit(255); + } + +- code = (main_fn) s->offset; ++ code = (main_fn) (intptr_t) s->offset; + + argv++, argc--; /* remove 'rdx' from command line */ + diff --git a/nasm.changes b/nasm.changes index 06e8aa4..cdfd957 100644 --- a/nasm.changes +++ b/nasm.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Thu Jan 10 19:16:21 CET 2008 - pth@suse.de + +- Update to 2.01rc2: + 2.01 + ---- + * Fix the handling of MMX registers with explicit "qword" tags on + memory (broken in 2.00 due to 64-bit changes.) + * Fix the PREFETCH instructions. + * Fix the documentation. + * Fix debugging info when using "-f elf" (backwards alias for "-f + elf32"). + * Man pages for rdoff tools (from the Debian project.) + + 2.00 + ---- + * Added c99 data-type compliance. + * Added general x86-64 support. + * Added win64 (x86-64 COFF) output format. + * Added __BITS__ standard macro. + * Renamed the elf output format to elf32 for clarity. + * Added elf64 and macho (MacOS X) output formats. + * Added Numeric constants in DQ directive. + * Added oword, do and reso pseudo operands. + * Allow underscores in numbers. + * Added 8-, 16- and 128-bit floating-point formats. + * Added binary, octal and hexadecimal floating-point. + * Correct the generation of floating-point constants. + * Added Floating-point option control. + * Added Infinity and NaN floating point support. + * Added ELF Symbol Visibility support. + * Added Setting OSABI value in ELF header directive. + * Added Generate Makefile Dependencies option. + * Added Unlimited Optimization Passes option. + * Added %IFN and %ELIFN support. + * Added Logical Negation Operator. + * Enhanced Stack Relative Preprocessor Directives. + * Enhanced ELF Debug Formats. + * Enhanced Send Errors to a File option. + * Added SSSE3, SSE4.1, SSE4.2, SSE5 support. + * Added a large number of additional instructions. + * Significant performance improvements. +- Fix array sized to low. +- Fix pointer->int cast. + ------------------------------------------------------------------- Fri Jan 26 13:16:42 CET 2007 - ro@suse.de diff --git a/nasm.spec b/nasm.spec index 453ee02..4883ccc 100644 --- a/nasm.spec +++ b/nasm.spec @@ -1,7 +1,7 @@ # -# spec file for package nasm (Version 0.98.39) +# spec file for package nasm (Version 2.01rc2) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,14 +12,16 @@ Name: nasm BuildRequires: ghostscript_any -URL: http://nasm.sourceforge.net/ -License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Url: http://nasm.sourceforge.net/ +License: LGPL v2.1 or later Group: Development/Languages/Other -Autoreqprov: on -Version: 0.98.39 -Release: 35 +AutoReqProv: on +Version: 2.01rc2 +Release: 1 Summary: Netwide Assembler (An x86 Assembler) Source: nasm-%version.tar.bz2 +Patch0: nasm-array_too_small.patch +Patch1: nasm-codecleanup.patch PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,18 +35,42 @@ Read the licence agreement in /usr/share/doc/packages/nasm/Licence. Authors: -------- - Julian Hall + Julian Hall + Simon Tatham + Nelson Rush + Frank Kotler + Stephen Silver + John Coffman + Yuri Zaporogets + H. Peter Anvin + John Fine + Kendall Bennet + Gary Clark + Andrew Crabtree + Rafael R. Sevilla + Jaime Tejedor GXmez, aka Metalbrain + James Seter + Edward J. Beroset + Stanislav Karchebny, aka berkus, madfire, daemonhunter + Debbie Wiles, aka debs + Trevor Woerner + Michael K. Ter Louw + Martin Wawro + Alexei Frounze + Keith Kanios, aka SpooK + Chuck Crayne %prep -%setup +%setup -q +%patch +%patch1 %build -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ +export CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --infodir=%{_infodir} --mandir=%{_mandir} make all doc %install -[ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; install -d -m 755 $RPM_BUILD_ROOT/usr/bin install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man1 install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm @@ -71,11 +97,51 @@ rm -f $RPM_BUILD_ROOT/%_docdir/nasm/*.ps %defattr(-,root,root) /usr/bin/* %doc %{_docdir}/nasm -%doc %{_mandir}/man1/nasm.1.gz -%doc %{_mandir}/man1/ndisasm.1.gz +%doc %{_mandir}/man1/*.1.gz %doc %{_infodir}/nasm* -%changelog -n nasm +%changelog +* Thu Jan 10 2008 - pth@suse.de +- Update to 2.01rc2: + 2.01 + ---- + * Fix the handling of MMX registers with explicit "qword" tags on + memory (broken in 2.00 due to 64-bit changes.) + * Fix the PREFETCH instructions. + * Fix the documentation. + * Fix debugging info when using "-f elf" (backwards alias for "-f + elf32"). + * Man pages for rdoff tools (from the Debian project.) + 2.00 + ---- + * Added c99 data-type compliance. + * Added general x86-64 support. + * Added win64 (x86-64 COFF) output format. + * Added __BITS__ standard macro. + * Renamed the elf output format to elf32 for clarity. + * Added elf64 and macho (MacOS X) output formats. + * Added Numeric constants in DQ directive. + * Added oword, do and reso pseudo operands. + * Allow underscores in numbers. + * Added 8-, 16- and 128-bit floating-point formats. + * Added binary, octal and hexadecimal floating-point. + * Correct the generation of floating-point constants. + * Added Floating-point option control. + * Added Infinity and NaN floating point support. + * Added ELF Symbol Visibility support. + * Added Setting OSABI value in ELF header directive. + * Added Generate Makefile Dependencies option. + * Added Unlimited Optimization Passes option. + * Added %%IFN and %%ELIFN support. + * Added Logical Negation Operator. + * Enhanced Stack Relative Preprocessor Directives. + * Enhanced ELF Debug Formats. + * Enhanced Send Errors to a File option. + * Added SSSE3, SSE4.1, SSE4.2, SSE5 support. + * Added a large number of additional instructions. + * Significant performance improvements. +- Fix array sized to low. +- Fix pointer->int cast. * Fri Jan 26 2007 - ro@suse.de - replace ghostscript-mini by ghostscript_any in BuildReq (#119914) * Wed Jan 25 2006 - mls@suse.de