- tidy up the specfile per rpmlint comments
- use utf-8 and fix national characters in contributor's names - port bogus elf patch to new nasm version and turn it on again
This commit is contained in:
Petr Machata
parent
14bb3b1525
commit
126d8b9c1b
@ -1,36 +1,36 @@
|
||||
--- nasm-0.98.39/output/outelf.c.boguself Sun May 20 01:25:35 2001
|
||||
+++ nasm-0.98.39/output/outelf.c Sun May 20 02:01:59 2001
|
||||
@@ -548,7 +548,7 @@ static void elf_add_reloc (struct Sectio
|
||||
r->symbol = 0;
|
||||
for (i=0; i<nsects; i++)
|
||||
if (segment == sects[i]->index)
|
||||
- r->symbol = i+3;
|
||||
+ r->symbol = i+2;
|
||||
if (!r->symbol)
|
||||
r->symbol = GLOBAL_TEMP_BASE + raa_read(bsym, segment);
|
||||
r->symbol = 0;
|
||||
for (i = 0; i < nsects; i++)
|
||||
if (segment == sects[i]->index)
|
||||
- r->symbol = i + 3;
|
||||
+ r->symbol = i + 2;
|
||||
if (!r->symbol)
|
||||
r->symbol = GLOBAL_TEMP_BASE + raa_read(bsym, segment);
|
||||
}
|
||||
@@ -922,13 +922,13 @@ static struct SAA *elf_build_symtab (lon
|
||||
* Now some standard symbols defining the segments, for relocation
|
||||
* purposes.
|
||||
*/
|
||||
- for (i = 1; i <= nsects+1; i++) {
|
||||
- for (i = 1; i <= nsects + 1; i++) {
|
||||
+ for (i = 1; i <= nsects; i++) {
|
||||
p = entry;
|
||||
WRITELONG (p, 0); /* no symbol name */
|
||||
WRITELONG (p, 0); /* offset zero */
|
||||
WRITELONG (p, 0); /* size zero */
|
||||
WRITESHORT (p, 3); /* local section-type thing */
|
||||
- WRITESHORT (p, (i==1 ? SHN_ABS : i-1)); /* the section id */
|
||||
+ WRITESHORT (p, i); /* the section id */
|
||||
saa_wbytes (s, entry, 16L);
|
||||
*len += 16;
|
||||
(*local)++;
|
||||
p = entry;
|
||||
WRITELONG(p, 0); /* no symbol name */
|
||||
WRITELONG(p, 0); /* offset zero */
|
||||
WRITELONG(p, 0); /* size zero */
|
||||
WRITESHORT(p, 3); /* local section-type thing */
|
||||
- WRITESHORT(p, (i == 1 ? SHN_ABS : i - 1)); /* the section id */
|
||||
+ WRITESHORT (p, i); /* the section id */
|
||||
saa_wbytes(s, entry, 16L);
|
||||
*len += 16;
|
||||
(*local)++;
|
||||
@@ -986,7 +986,7 @@ static struct SAA *elf_build_reltab (lon
|
||||
long sym = r->symbol;
|
||||
long sym = r->symbol;
|
||||
|
||||
if (sym >= GLOBAL_TEMP_BASE)
|
||||
- sym += -GLOBAL_TEMP_BASE + (nsects+3) + nlocals;
|
||||
+ sym += -GLOBAL_TEMP_BASE + (nsects+2) + nlocals;
|
||||
if (sym >= GLOBAL_TEMP_BASE)
|
||||
- sym += -GLOBAL_TEMP_BASE + (nsects + 3) + nlocals;
|
||||
+ sym += -GLOBAL_TEMP_BASE + (nsects + 2) + nlocals;
|
||||
|
||||
p = entry;
|
||||
WRITELONG (p, r->address);
|
||||
p = entry;
|
||||
WRITELONG(p, r->address);
|
||||
|
||||
61
nasm.spec
61
nasm.spec
@ -1,24 +1,26 @@
|
||||
Summary: A portable x86 assembler which uses Intel-like syntax.
|
||||
# -*- coding: utf-8 -*-
|
||||
Summary: A portable x86 assembler which uses Intel-like syntax
|
||||
Name: nasm
|
||||
Version: 0.98.39
|
||||
Release: 4%{?dist}
|
||||
Patch0: nasm-0.98-boguself2.patch
|
||||
Patch1: nasm-0.98.39-overfl.patch
|
||||
Release: 5%{?dist}
|
||||
License: LGPL
|
||||
Group: Development/Languages
|
||||
Source: http://prdownloads.sourceforge.net/nasm/nasm-%{version}.tar.bz2
|
||||
URL: http://nasm.sourceforge.net/
|
||||
Source: http://prdownloads.sourceforge.net/nasm/nasm-%{version}.tar.bz2
|
||||
Patch0: nasm-0.98-boguself2.patch
|
||||
Patch1: nasm-0.98.39-overfl.patch
|
||||
BuildRequires: perl
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
Prereq: /sbin/install-info
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for NASM.
|
||||
Summary: Documentation for NASM
|
||||
Group: Development/Languages
|
||||
BuildRequires: ghostscript, texinfo
|
||||
|
||||
%package rdoff
|
||||
Summary: Tools for the RDOFF binary format, sometimes used with NASM.
|
||||
Summary: Tools for the RDOFF binary format, sometimes used with NASM
|
||||
Group: Development/Tools
|
||||
|
||||
%description
|
||||
@ -36,9 +38,9 @@ is sometimes used with the Netwide Assembler (NASM). These tools
|
||||
include linker, library manager, loader, and information dump.
|
||||
|
||||
%prep
|
||||
%setup
|
||||
#%patch0 -p1 -b .boguself
|
||||
%patch1 -p1 -b .overfl
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -53,14 +55,14 @@ mkdir -p $RPM_BUILD_ROOT/usr/tempdoc
|
||||
%makeinstall install_everything docdir=$RPM_BUILD_ROOT/usr/tempdoc
|
||||
cp -a $RPM_BUILD_ROOT/usr/tempdoc/html $RPM_BUILD_ROOT/usr/tempdoc/nasmdoc.{ps,txt,pdf} .
|
||||
gzip -9f nasmdoc.{ps,txt}
|
||||
# remove unpackaged filed from the buildroot
|
||||
# remove unpackaged files from the buildroot
|
||||
rm -rf $RPM_BUILD_ROOT%{_prefix}/tempdoc
|
||||
rm -f $RPM_BUILD_ROOT%{_bindir}/rdf2ihx
|
||||
|
||||
%clean
|
||||
rm -rf "$RPM_BUILD_ROOT"
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%post
|
||||
%post
|
||||
/sbin/install-info %{_infodir}/nasm.info.gz %{_infodir}/dir || :
|
||||
|
||||
%preun
|
||||
@ -90,8 +92,13 @@ fi
|
||||
%{_bindir}/rdx
|
||||
|
||||
%changelog
|
||||
* Wed Feb 7 2007 Petr Machata <pmachata@redhat.com> - 0.98.39-5
|
||||
- tidy up the specfile per rpmlint comments
|
||||
- use utf-8 and fix national characters in contributor's names
|
||||
- port bogus elf patch to new nasm version and turn it on again
|
||||
|
||||
* Thu Jan 25 2007 Petr Machata <pmachata@redhat.com> - 0.98.39-4
|
||||
- Ville Skytta: patch for non-failing %%post, %%preun
|
||||
- Ville Skyttä: patch for non-failing %%post, %%preun
|
||||
- Resolves: #223714
|
||||
|
||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.98.39-3.2.2
|
||||
@ -148,7 +155,7 @@ fi
|
||||
* Mon Sep 16 2002 Jeremy Katz <katzj@redhat.com> 0.98.34-1hammer
|
||||
- add x86_64 to ExclusiveArch list
|
||||
|
||||
* Tue Jul 23 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.98.34-1
|
||||
* Tue Jul 23 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.98.34-1
|
||||
- 0.98.34
|
||||
|
||||
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
|
||||
@ -157,14 +164,14 @@ fi
|
||||
* Sun May 26 2002 Tim Powers <timp@redhat.com>
|
||||
- automated rebuild
|
||||
|
||||
* Tue May 21 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.98.32-1
|
||||
* Tue May 21 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.98.32-1
|
||||
- 0.98.32
|
||||
- Various doc files have changed names/been removed/added
|
||||
- New download location (after the license change, it's at sourceforge)
|
||||
- The new version is LGPL
|
||||
- Only build on x86 (#65255)
|
||||
|
||||
* Tue Feb 26 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.98.22-2
|
||||
* Tue Feb 26 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.98.22-2
|
||||
- Rebuild
|
||||
|
||||
* Mon Jan 21 2002 Bernhard Rosenkraenzer <bero@redhat.com>
|
||||
@ -174,23 +181,23 @@ fi
|
||||
* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
|
||||
- automated rebuild
|
||||
|
||||
* Tue Aug 7 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
- Updated patch from H.J. Lu for bogus elf generation (#45986,
|
||||
* Tue Aug 7 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
- Updated patch from H.J. Lu for bogus elf generation (#45986,
|
||||
verified by reporter)
|
||||
|
||||
* Thu Apr 26 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
- Updated patch for bogus elf generation from hjl@gnu.org
|
||||
* Thu Apr 26 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
- Updated patch for bogus elf generation from hjl@gnu.org
|
||||
|
||||
* Tue Feb 13 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
* Tue Feb 13 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
- Add patch from H.J. Lu to avoid creating bogus elf objects (#27489)
|
||||
|
||||
* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
|
||||
- automatic rebuild
|
||||
|
||||
* Tue Jun 13 2000 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
* Tue Jun 13 2000 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
- rewrote almost everything. The old specfile was bad, bad, bad.
|
||||
Really Bad.
|
||||
|
||||
Really Bad.
|
||||
|
||||
* Tue Apr 04 2000 Erik Troan <ewt@redhat.com>
|
||||
- moved to distribution (syslinux needs it)
|
||||
- gzipped man pages
|
||||
|
||||
Loading…
Reference in New Issue
Block a user