Attachment 9897 Details for Bug 22388 – Updated patch for nasm 2.13.02

[patch] Updated patch for nasm 2.13.02

nasm-2.13.02-update.patch (text/plain), 1.96 KB, created by Stig-Ørjan Smelror on 2018-01-14 07:20:59 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Stig-Ørjan Smelror

Created: 2018-01-14 07:20:59 CET

Size: 1.96 KB

patch

obsolete

>Index: SOURCES/sha1.lst
>===================================================================
>--- SOURCES/sha1.lst	(revision 1192878)
>+++ SOURCES/sha1.lst	(working copy)
>@@ -1 +1 @@
>-a0e6e655d04009178d4b7c15d935a46a691a617c  nasm-2.12.02.tar.xz
>+9f2e5f95d7966fe609c7c20771d64254ee77204e  nasm-2.13.02.tar.xz
>Index: SPECS/nasm.spec
>===================================================================
>--- SPECS/nasm.spec	(revision 1192878)
>+++ SPECS/nasm.spec	(working copy)
>@@ -3,20 +3,21 @@
> %define fname %{name}-%{fversion}
> Summary:	The Netwide Assembler, a portable x86 assembler with Intel-like syntax
> Name:		nasm
>-Version:	2.12.02
>-Release:	%mkrel 2
>+Version:	2.13.02
>+Release:	%mkrel 1
> Epoch:		1
> License:	BSD
> Group:		Development/Other
> 
> Source:		http://www.nasm.us/pub/nasm/releasebuilds/%{fversion}/%{fname}.tar.xz
>-Patch0: 0001-preproc-Only-concat-tok-text-if-we-accounted-for-its.patch
>-Patch1: 0002-preproc-Workaround-a-usage-after-free-bug.patch
>-Patch2: 0003-preproc-Free-token-s-text-if-only-it-has-been-modifi.patch
>-URL:		http://nasm.sourceforge.net
>+Patch0:		nasm-2.13.02-switch-font-for-nasmdoc.patch
>+URL:		http://www.nasm.us/
> BuildRequires:	ghostscript
> BuildRequires:	groff
> BuildRequires:	texinfo
>+BuildRequires:	perl(Font::TTF::Font)
>+BuildRequires:	perl(Sort::Versions)
>+BuildRequires:	fonts-ttf-liberation
> 
> %package doc
> Summary:	Extensive documentation for NASM
>@@ -55,17 +56,10 @@
> mkdir -p %{buildroot}/{%{_bindir},%{_infodir},%{_mandir}/man1}
> %makeinstall install_rdf
> cd doc
>-install info/* %{buildroot}/%{_infodir}/
> bzip2 -9f nasmdoc*.txt nasmdoc*.ps||true
> cd html
> ln -sf nasmdoc0.html index.html
> 
>-%post
>-%_install_info nasm.info
>-
>-%preun
>-%_remove_install_info nasm.info
>-
> %files
> %doc LICENSE CHANGES TODO AUTHORS README doc/internal.doc
> %attr(755,root,root) %{_bindir}/nasm
>@@ -74,7 +68,6 @@
> %{_mandir}/man1/nasm.1*
> %{_mandir}/man1/ndisasm.1*
> %{_mandir}/man1/rd*.1*
>-%{_infodir}/nasm.info*
> 
> %files doc
> %doc doc/nasmdoc.ps.bz2 doc/nasmdoc.txt.bz2  doc/html

Index: SOURCES/sha1.lst
===================================================================
--- SOURCES/sha1.lst	(revision 1192878)
+++ SOURCES/sha1.lst	(working copy)
@@ -1 +1 @@
-a0e6e655d04009178d4b7c15d935a46a691a617c  nasm-2.12.02.tar.xz
+9f2e5f95d7966fe609c7c20771d64254ee77204e  nasm-2.13.02.tar.xz
Index: SPECS/nasm.spec
===================================================================
--- SPECS/nasm.spec	(revision 1192878)
+++ SPECS/nasm.spec	(working copy)
@@ -3,20 +3,21 @@
 %define fname %{name}-%{fversion}
 Summary:	The Netwide Assembler, a portable x86 assembler with Intel-like syntax
 Name:		nasm
-Version:	2.12.02
-Release:	%mkrel 2
+Version:	2.13.02
+Release:	%mkrel 1
 Epoch:		1
 License:	BSD
 Group:		Development/Other
 
 Source:		http://www.nasm.us/pub/nasm/releasebuilds/%{fversion}/%{fname}.tar.xz
-Patch0: 0001-preproc-Only-concat-tok-text-if-we-accounted-for-its.patch
-Patch1: 0002-preproc-Workaround-a-usage-after-free-bug.patch
-Patch2: 0003-preproc-Free-token-s-text-if-only-it-has-been-modifi.patch
-URL:		http://nasm.sourceforge.net
+Patch0:		nasm-2.13.02-switch-font-for-nasmdoc.patch
+URL:		http://www.nasm.us/
 BuildRequires:	ghostscript
 BuildRequires:	groff
 BuildRequires:	texinfo
+BuildRequires:	perl(Font::TTF::Font)
+BuildRequires:	perl(Sort::Versions)
+BuildRequires:	fonts-ttf-liberation
 
 %package doc
 Summary:	Extensive documentation for NASM
@@ -55,17 +56,10 @@
 mkdir -p %{buildroot}/{%{_bindir},%{_infodir},%{_mandir}/man1}
 %makeinstall install_rdf
 cd doc
-install info/* %{buildroot}/%{_infodir}/
 bzip2 -9f nasmdoc*.txt nasmdoc*.ps||true
 cd html
 ln -sf nasmdoc0.html index.html
 
-%post
-%_install_info nasm.info
-
-%preun
-%_remove_install_info nasm.info
-
 %files
 %doc LICENSE CHANGES TODO AUTHORS README doc/internal.doc
 %attr(755,root,root) %{_bindir}/nasm
@@ -74,7 +68,6 @@
 %{_mandir}/man1/nasm.1*
 %{_mandir}/man1/ndisasm.1*
 %{_mandir}/man1/rd*.1*
-%{_infodir}/nasm.info*
 
 %files doc
 %doc doc/nasmdoc.ps.bz2 doc/nasmdoc.txt.bz2  doc/html

Actions: View | Diff

Attachments on bug 22388: 9896 | 9897 | 9898 | 9991