Commit Graph

41 Commits

Author SHA1 Message Date
H. Peter Anvin
2553833cc1 nasm.spec.in: fix mistakes in previous checkin
Fix small mistakes in previous nasm.spec.in patch.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2024-04-18 15:31:51 -07:00
H. Peter Anvin
0346e58b6e nasm.spec.in: add Obsoletes tags where applicable; fix License tag
Add Obsoletes tags: nasm-rdoff; old nasm-doc.

Add a few BuildRequires: tags.

Update License: tag to match SPDX.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
2024-04-18 14:01:40 -07:00
H. Peter Anvin
f932b338e3 spec: update embedded RPM spec file
The embedded RPM spec file seems to be a bit out of date. Update to
match the current RPM conventions.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2024-04-16 16:35:22 -07:00
H. Peter Anvin
93548c2de2 rdoff: kill it off
RDOFF has been deprecated as it has unfixable problems, and has been
announced that it will be killed off in NASM 2.16.

This deletes it once and for all.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2022-11-07 16:49:13 -08:00
H. Peter Anvin (Intel)
fb7753bc2b nasm.spec.in: need perl; .pdf.xz now build by standard Makefile
Building NASM from scratch needs perl.

.pdf.xz is now build by the standard NASM Makefile.in, so don't
do it again (it causes failures.)

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
2020-06-04 17:17:28 -07:00
H. Peter Anvin
77703ae4a4 nasm.spec.in: remove obsolete files
README and TODO are deleted and CHANGES is meaningless.
2018-12-26 06:13:06 -08:00
H. Peter Anvin
72f2acc595 nasm.spec.in: we need *automake*; autoheader is in autoconf
We need the automake package for autogen.sh; the autoheader program is
in the autoconf package.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2018-12-26 06:06:02 -08:00
H. Peter Anvin
33ce149330 nasm.spec.in: need autoheader, use autogen.sh
We need to use our new autogen.sh, which in turn needs autoheader.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2018-12-26 06:03:57 -08:00
Cyrill Gorcunov
20d9c86eb1 build: Merge CPPFLAGS into ALL_CFLAGS
This is a fix for a4f6ca5a33

 - We should not use sole CPPFLAGS when compiling,
   but rather merge it into ALL_CFLAGS

 - nasm.spec.in should use DESTDIR since
   INSTALLROOT now renamed to it

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
2017-07-06 01:36:06 +03:00
H. Peter Anvin
7aae842810 nasm.spec: LTO breaks debug info, fall back to --enable-sections
--enable-lto seems to completely break RPM debug information, so fall
back on --enable-sections, which at least allows the linker to do
better dead code removal.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2017-04-23 21:19:09 -07:00
H. Peter Anvin
b8b77e4452 nasm.spec: more cleanups, doc is noarch
The doc file is noarch, and do some other cleanups.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2017-04-23 21:15:05 -07:00
H. Peter Anvin
cf96845bf6 nasm.spec: sync with Fedora spec file, auto-generate Perl depends
Sync up with how the Fedora spec file has evolved.
Auto-generate the Perl build dependencies.
Add --enable-lto: it makes especally the rdoff files much smaller.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2017-04-23 18:33:53 -07:00
H. Peter Anvin
5194f77bfd doc: add indented paragraphs, valid XHTML, CSS style sheet
Add indented paragraphs, which can be used to continue an item in a
bulleted list.

Produce valid strict XHTML, and include a style sheet with a navbar
and other fancy things.

Remove archaic output formats.  Now only text, XHTML, and PDF are
supported.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2017-04-13 22:12:05 -07:00
H. Peter Anvin
f13effec22 doc: add the option to generate an uncompressed PDF
An uncompressed PDF is about twice as big, but if one is using an
external compression program (e.g. .pdf.xz) it compresses far better.
Use it for the RPM specfile.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2017-04-10 16:10:28 -07:00
H. Peter Anvin
c11e23004f nasm.spec.in: drop nasmdoc.ps.gz, compress .txt and .pdf with xz
Drop nasmdoc.ps(.gz), being redundant and inferior to nasmdoc.pdf.

Tools now generally support xz compression out of the box so use xz
compression for these files.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2017-04-10 15:42:02 -07:00
H. Peter Anvin
a959e3085d nasm.spec.in: split BuildRequires line
\ apparently doesn't work as continuation lines, just split it
up.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2017-04-10 07:09:51 -07:00
H. Peter Anvin
9191dae375 nasm.spec.in: add fontconfig as a built requirement
Add fontconfig as a build requirement.  It is technically not
obligatory, but may make the build quite a bit faster.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2017-04-10 07:02:18 -07:00
H. Peter Anvin
70b070f952 doc: improve the look of the documentation with better fonts
Use the Adobe Source Sans/Code Pro fonts by default.  They are Open
Source fonts by Adobe.  However, since these fonts are quite large,
let them be an external dependency and do our best to try to find them
with whatever mechanism is available on the system for finding
standard fonts.

Also have a list of substitution fonts if necessary.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2017-04-10 06:35:29 -07:00
H. Peter Anvin
96edc04a39 nasm.spec.in: document buildrequires properly
We need asciidoc, xmlto, ghostscript, texinfo in order to be able to
build the documentation.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-02-23 02:01:17 -08:00
H. Peter Anvin
b7511971dc nasm.spec: change release to 0 to avoid distro conflicts
Change the RPM release number to 0 so that distribution-produced RPMs
will take precedence in all cases.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2016-02-22 01:18:33 -08:00
H. Peter Anvin
bd8cef73d1 nasm.spec.in: switch to .xz as the source file
Switch the source file to use for the SRPM to the .xz file.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2012-02-26 08:19:56 -08:00
H. Peter Anvin
55fe7735cf spec: update to match requirements of Fedora 14+
"PreReq" is no longer accepted as an alias for "Requires".  Sigh.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2011-06-06 14:53:22 -07:00
H. Peter Anvin
460a4fef3a spec: change License to BSD
The appropriate License tag for the 2-clause BSD license is... wait
for it... "BSD".  Make it so.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-07-06 11:14:38 -07:00
H. Peter Anvin
20c1d4136d spec: update specfile with new rdf2bin aliases
Update the specfile to contain the new rdf2bin aliases and their man
pages.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-07-03 21:12:05 -07:00
H. Peter Anvin
1957e65ca4 specfile: update URLs
Update the URLs in the specfile to point to http://www.nasm.us/.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-05-26 16:09:15 -07:00
H. Peter Anvin
a7dd90ee82 specfile: correctly handle compressed manpages 2007-12-26 10:18:01 -08:00
H. Peter Anvin
a81c62e18f Add RDOFF man pages to specfile. 2007-12-18 16:13:47 -08:00
H. Peter Anvin
a8eace2b79 Modernize nasm.spec.in and make it closer to the Fedora version 2007-10-19 10:52:31 -07:00
H. Peter Anvin
441ad9d9b2 nasm.spec.in: minor fixes
%setup needs -n to deal with the case when nasm_version != _version
There is no standard %make macro, just use "make".
2007-09-22 16:44:56 -07:00
H. Peter Anvin
9b8f0ad113 Update nasm.spec.in and make it handle rc releases
Update nasm.spec.in to match modern conventions, and make it handle rc
releases by using the "mangled" version of the name (1.99.99.91
instead of 2.0rc1).
2007-09-22 16:35:11 -07:00
H. Peter Anvin
d105682096 Remove $Id$ tags (useless with git)
Remove CVS $Id$ tags, since git doesn't use them.
2007-09-12 21:05:06 -07:00
H. Peter Anvin
f6abe44fc8 nasm.spec.in: Copyright -> License 2007-09-05 06:48:38 +00:00
H. Peter Anvin
da51fc9dac Remove obsolete Serial: construct; we shouldn't need it anyway. 2007-09-05 06:24:43 +00:00
H. Peter Anvin
e68699287c Update for newer RH releases 2003-08-29 21:03:44 +00:00
H. Peter Anvin
634a6607ca %{_arch} doesn't work with newer RPMs; use %{_target_cpu} instead 2003-08-29 20:48:37 +00:00
H. Peter Anvin
4fb2184513 Update URLs; make compatible with newer RPMs 2003-08-29 19:50:25 +00:00
H. Peter Anvin
f29b128afd Accept X.YYplZ as a valid version number (equivalent to X.YY.0.Z) and
generate Serial: tags in the RPM spec file to help clue RPM in.
2002-05-21 02:28:51 +00:00
H. Peter Anvin
97f0a2bf6b Make RPM itself cycle through the necessary "architectures" to produce
the doc package as noarch and the rest as the default arch.
2002-05-06 07:07:25 +00:00
H. Peter Anvin
6eec6f4590 Build the nasm-doc RPM as a noarch RPM. Unfortunately that has to be
built using a separate invocation of rpm :(
2002-05-06 06:46:14 +00:00
H. Peter Anvin
d079d89621 Remove reference to now obsolete patch 2002-05-06 06:32:23 +00:00
H. Peter Anvin
87242df32d Update nasm.spec; preprocess it to use the version number from the
"version" file.
2002-05-04 05:14:03 +00:00