- nasm-cpp_macros.patch: avoid #ifdef in a macro argument.

- Release 2.

Changed files:
    nasm-cpp_macros.patch -> 1.1
    nasm.spec -> 1.33

diff --git a/nasm-cpp_macros.patch b/nasm-cpp_macros.patch
new file mode 100644 (file)
index 0000000..5f653e1
--- /dev/null
+++ b/nasm-cpp_macros.patch
@@ -0,0 +1,22 @@
+--- nasm-0.98.08/nasm.c~       Mon Mar  5 13:07:28 2001
++++ nasm-0.98.08/nasm.c        Fri Nov 30 18:01:42 2001
+@@ -422,7 +422,8 @@
+           using_debug_info = TRUE;
+           break;
+         case 'h':
+-          printf("usage: nasm [-@ response file] [-o outfile] [-f format] "
++          {const char *help_text =
++                 "usage: nasm [-@ response file] [-o outfile] [-f format] "
+                  "[-l listfile]\n"
+                  "            [options...] [--] filename\n"
+                  "    or nasm -r   for version info\n\n"
+@@ -443,7 +444,8 @@
+                  "    -D<macro>[=<value>] pre-defines a macro\n"
+                  "    -U<macro>   undefines a macro\n"
+                  "    -w+foo      enables warnings about foo; -w-foo disables them\n"
+-                 "where foo can be:\n");
++                 "where foo can be:\n";
++          printf(help_text);}
+           for (i=1; i<=ERR_WARN_MAX; i++)
+               printf("    %-16s%s (default %s)\n",
+                      suppressed_names[i], suppressed_what[i],

diff --git a/nasm.spec b/nasm.spec
index 8e94caacd80b4382a78a4c1219b67fff26874bc0..e92ed1c5551b42b64f5b2ed2b21854a50f6462f2 100644 (file)
--- a/nasm.spec
+++ b/nasm.spec
@@ -2,7 +2,7 @@ Summary:        Nasm is a free assembler for the 80x86 series of microprocessors
 Summary(pl):   Nasm jest darmowym asemblerem dla procesorów z serii 80x86
 Name:          nasm
 Version:       0.98.08
 Summary(pl):   Nasm jest darmowym asemblerem dla procesorów z serii 80x86
 Name:          nasm
 Version:       0.98.08

-Release:       1
+Release:       2

 License:       GPL
 Group:         Development/Tools
 Group(de):     Entwicklung/Werkzeuge
 License:       GPL
 Group:         Development/Tools
 Group(de):     Entwicklung/Werkzeuge


@@ -11,6 +11,7 @@ Group(pl):    Programowanie/Narz
 Source0:       http://www.octium.net/nasm/packages/%{name}-%{version}.tar.gz
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-boguself2.patch
 Source0:       http://www.octium.net/nasm/packages/%{name}-%{version}.tar.gz
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-boguself2.patch

+Patch2:                %{name}-cpp_macros.patch

 URL:           http://www.octium.net/nasm/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: autoconf
 URL:           http://www.octium.net/nasm/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: autoconf


@@ -58,6 +59,7 @@ zawieraj
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %setup -q
 %patch0 -p1
 %patch1 -p1

+%patch2 -p1

 
 %build
 autoconf
 
 %build
 autoconf