- nasm fix

Changed files:
    btmgr.spec -> 1.3
    nasm.patch -> 1.1

diff --git a/btmgr.spec b/btmgr.spec
index a4a19dede26fb8b97639383813bf3e97066535c0..942329386327ecaff78c24cd78e8bedca7fe7071 100644 (file)
--- a/btmgr.spec
+++ b/btmgr.spec
@@ -10,6 +10,7 @@ License:      GPL v2
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/btmgr/%{name}-%{version}-1.tar.gz
 # Source0-md5: 7bfe432821c3cef48df8b3d6be800009
+Patch0:                nasm.patch
 URL:           http://sourceforge.net/projects/btmgr/
 BuildRequires: nasm
 BuildRequires: sed >= 4.0
@@ -30,6 +31,7 @@ CD-ROM. There are plans to support ZIP and LS-120 in the near future.
 
 %prep
 %setup -q -n %{name}-%{version}-1
+%patch0 -p1
 
 # allow passing defaults
 %{__sed} -i -e '/^CC=/ s/gcc/$(HOSTCC)/' Makefile

diff --git a/nasm.patch b/nasm.patch
new file mode 100644 (file)
index 0000000..5970d4d
--- /dev/null
+++ b/nasm.patch
@@ -0,0 +1,14 @@
+http://sourceforge.net/mailarchive/message.php?msg_id=7380111
+
+--- btmgr-3.7-1/./manager/helptool.h~  2000-09-02 18:21:51.000000000 +0300
++++ btmgr-3.7-1/./manager/helptool.h   2011-07-20 14:09:24.750719959 +0300
+@@ -623,7 +623,8 @@
+ 
+ %macro endblock 0-1
+       %ifctx orblock
+-              cat_jmp %$ifnot,__level__
++;       cat_jmp %$ifnot,__level__    ; as it was
++        jmp %$$ifnot       ; this does - 0.98 or 0.98.35
+               %$iftrue:
+       %elifctx andblock
+       %else