From a5f9eafe0efde091755ff2739ac4ba9bb993ba48d58cb32093227eebd11b071f Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Sun, 22 Feb 2015 20:58:53 +0000 Subject: [PATCH 1/2] Accepting request 287151 from home:pluskalm:branches:devel:tools:compiler - Cleanup spec file with spec-cleaner - Update project url - Switch to .xz source - Update to 2.11.06: OBS-URL: https://build.opensuse.org/request/show/287151 OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/nasm?expand=0&rev=21 --- nasm-2.10.09.tar.bz2 | 3 --- nasm-2.11.06.tar.xz | 3 +++ nasm.changes | 22 ++++++++++++++++++++ nasm.spec | 48 ++++++++++++++++++++++---------------------- 4 files changed, 49 insertions(+), 27 deletions(-) delete mode 100644 nasm-2.10.09.tar.bz2 create mode 100644 nasm-2.11.06.tar.xz diff --git a/nasm-2.10.09.tar.bz2 b/nasm-2.10.09.tar.bz2 deleted file mode 100644 index 690d40a..0000000 --- a/nasm-2.10.09.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7141180d3874b5967c6a60191e8d45fba9cc86bd60a4803ad80b6b6b3eac36b9 -size 826334 diff --git a/nasm-2.11.06.tar.xz b/nasm-2.11.06.tar.xz new file mode 100644 index 0000000..a9a6fdc --- /dev/null +++ b/nasm-2.11.06.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90f60d95a15b8a54bf34d87b9be53da89ee3d6213ea739fb2305846f4585868a +size 763960 diff --git a/nasm.changes b/nasm.changes index c3efe28..ea8faa6 100644 --- a/nasm.changes +++ b/nasm.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sat Feb 21 14:54:41 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Update project url +- Switch to .xz source +- Update to 2.11.06: + * Add support for the Intel AVX-512 instruction set: + * 16 new, 512-bit SIMD registers. Total 32 (ZMM0 ~ ZMM31) + * 8 new opmask registers (K0 ~ K7). One of 7 registers (K1 ~ K7) + can be used as an opmask for conditional execution. + * A new EVEX encoding prefix. EVEX is based on VEX and provides + more capabilities: opmasks, broadcasting, embedded rounding and + compressed displacements. + * Add support for ZWORD (512 bits), DZ and RESZ. + * Add support for the MPX and SHA instruction sets. + * Better handling of section redefinition. + * Generate manpages when running 'make dist'. + * Handle all token chains in mmacro params range. + * Support split [base,index] effective address: + * for more details see http://www.nasm.us/doc/nasmdocc.html + ------------------------------------------------------------------- Fri Jul 26 07:03:58 UTC 2013 - crrodriguez@opensuse.org diff --git a/nasm.spec b/nasm.spec index a6d4d39..18aad43 100644 --- a/nasm.spec +++ b/nasm.spec @@ -1,7 +1,7 @@ # # spec file for package nasm # -# Copyright (c) 2013 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,13 +17,13 @@ Name: nasm -Url: http://nasm.sourceforge.net/ -Version: 2.10.09 +Version: 2.11.06 Release: 0 Summary: Netwide Assembler (An x86 Assembler) License: BSD-2-Clause Group: Development/Languages/Other -Source: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.bz2 +Url: http://www.nasm.us/ +Source: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.xz BuildRequires: makeinfo BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -31,7 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build NASM is a prototype general-purpose x86 assembler. It can currently output several binary formats, including ELF, a.out, Win32, and OS/2. -Read the licence agreement in /usr/share/doc/packages/nasm/Licence. +Read the licence agreement in %{_docdir}/nasm/Licence. %prep %setup -q @@ -40,8 +40,9 @@ Read the licence agreement in /usr/share/doc/packages/nasm/Licence. Summary: Documentation for Nasm License: LGPL-2.1+ Group: Development/Languages/Other -PreReq: %install_info_prereq -Provides: nasm:/usr/share/doc/packages/nasm/nasmdoc.pdf +Requires(post): info +Requires(preun): info +Provides: nasm:%{_docdir}/nasm/nasmdoc.pdf %description doc This package contains the documentation for Nasm. @@ -52,27 +53,26 @@ TS=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$TS\"/g" ver.c touch -r ./ver.c.stamp ./ver.c %configure -make all +make %{?_smp_mflags} all -cd doc -make html info nasmdoc.ps nasmdoc.txt +make -C doc %{?_smp_mflags} html info nasmdoc.ps nasmdoc.txt %install -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 -install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm/rdoff -install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm/html -install -d -m 755 $RPM_BUILD_ROOT/%{_infodir} -make INSTALLROOT=$RPM_BUILD_ROOT install -make INSTALLROOT=$RPM_BUILD_ROOT rdf_install +install -d -m 755 %{buildroot}%{_prefix}/bin +install -d -m 755 %{buildroot}/%{_mandir}/man1 +install -d -m 755 %{buildroot}/%{_docdir}/nasm +install -d -m 755 %{buildroot}/%{_docdir}/nasm/rdoff +install -d -m 755 %{buildroot}/%{_docdir}/nasm/html +install -d -m 755 %{buildroot}/%{_infodir} +make INSTALLROOT=%{buildroot} install +make INSTALLROOT=%{buildroot} rdf_install install -m 644 AUTHORS CHANGES ChangeLog LICENSE TODO README doc/*.txt \ - $RPM_BUILD_ROOT/%{_docdir}/nasm + %{buildroot}/%{_docdir}/nasm install -m 644 rdoff/README rdoff/doc/* \ - $RPM_BUILD_ROOT/%{_docdir}/nasm/rdoff -install -m 644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/nasm/html -install -m 644 ndisasm.1 nasm.1 rdoff/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 644 doc/info/* $RPM_BUILD_ROOT%{_infodir} + %{buildroot}/%{_docdir}/nasm/rdoff +install -m 644 doc/html/* %{buildroot}%{_docdir}/nasm/html +install -m 644 ndisasm.1 nasm.1 rdoff/*.1 %{buildroot}%{_mandir}/man1 +install -m 644 doc/info/* %{buildroot}%{_infodir} %post doc %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -82,7 +82,7 @@ install -m 644 doc/info/* $RPM_BUILD_ROOT%{_infodir} %files %defattr(-,root,root) -/usr/bin/* +%{_bindir}/* %doc %{_mandir}/man1/*.1.gz %files doc From 252e182ad1970a7e314b8b6027131383e2b9ea3fef7b4832a024fd8e46082262 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 24 Feb 2015 08:52:18 +0000 Subject: [PATCH 2/2] Accepting request 287481 from home:pluskalm:branches:devel:tools:compiler - Build doc package as noarch - Use fdupes to remove duplicates - Update to 2.11.08 - Changes for 2.11.07 * Fix -MD option handling, which was rather broken in previous OBS-URL: https://build.opensuse.org/request/show/287481 OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/nasm?expand=0&rev=22 --- nasm-2.11.06.tar.xz | 3 --- nasm-2.11.08.tar.xz | 3 +++ nasm.changes | 29 +++++++++++++++++++++++++++++ nasm.spec | 5 ++++- 4 files changed, 36 insertions(+), 4 deletions(-) delete mode 100644 nasm-2.11.06.tar.xz create mode 100644 nasm-2.11.08.tar.xz diff --git a/nasm-2.11.06.tar.xz b/nasm-2.11.06.tar.xz deleted file mode 100644 index a9a6fdc..0000000 --- a/nasm-2.11.06.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90f60d95a15b8a54bf34d87b9be53da89ee3d6213ea739fb2305846f4585868a -size 763960 diff --git a/nasm-2.11.08.tar.xz b/nasm-2.11.08.tar.xz new file mode 100644 index 0000000..f5e9884 --- /dev/null +++ b/nasm-2.11.08.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c99467c7072211c550d147640d8a1a0aa4d636d4d8cf849f3bf4317d900a1f7f +size 764872 diff --git a/nasm.changes b/nasm.changes index ea8faa6..5fd5f6f 100644 --- a/nasm.changes +++ b/nasm.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Feb 24 08:36:37 UTC 2015 - mpluskal@suse.com + +- Build doc package as noarch +- Use fdupes to remove duplicates +- Update to 2.11.08 + * Fix section length computation in bin backend which leaded in + incorrect relocation records. + * Add a warning for numeric preprocessor definitions passed via + command line which might have unexpected results otherwise. + * Add ability to specify a module name record in rdoff linker + with -mn option. + * Increase label length capacity up to 256 bytes in rdoff + backend for FreePascal sake, which tends to generate very + long labels for procedures. + * Fix segmentation failure when rip addressing is used in macho64 + backend. + * Fix access on out of memory when handling strings with a + single grave. We have sixed similar problem in previous + release but not all cases were covered. + * Fix NULL dereference in disassembled on BND instruction. +- Changes for 2.11.07 + * Fix 256 bit VMOVNTPS instruction. + * Fix -MD option handling, which was rather broken in previous + release changing command line api. + * Fix access to unitialized space when handling strings with + a single grave. + * Fix nil dereference in handling memory reference parsing. + ------------------------------------------------------------------- Sat Feb 21 14:54:41 UTC 2015 - mpluskal@suse.com diff --git a/nasm.spec b/nasm.spec index 18aad43..7a5ab00 100644 --- a/nasm.spec +++ b/nasm.spec @@ -17,13 +17,14 @@ Name: nasm -Version: 2.11.06 +Version: 2.11.08 Release: 0 Summary: Netwide Assembler (An x86 Assembler) License: BSD-2-Clause Group: Development/Languages/Other Url: http://www.nasm.us/ Source: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.xz +BuildRequires: fdupes BuildRequires: makeinfo BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,6 +44,7 @@ Group: Development/Languages/Other Requires(post): info Requires(preun): info Provides: nasm:%{_docdir}/nasm/nasmdoc.pdf +BuildArch: noarch %description doc This package contains the documentation for Nasm. @@ -73,6 +75,7 @@ install -m 644 rdoff/README rdoff/doc/* \ install -m 644 doc/html/* %{buildroot}%{_docdir}/nasm/html install -m 644 ndisasm.1 nasm.1 rdoff/*.1 %{buildroot}%{_mandir}/man1 install -m 644 doc/info/* %{buildroot}%{_infodir} +%fdupes -s %{buildroot}%/* %post doc %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz