From c6f2c1081be214bc982881da532e1f99d67dc80cfd5a200a35ca1cdb8f874641 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 6 Jan 2011 10:11:18 +0000
Subject: [PATCH] Accepting request 56201 from
 home:coolo:branches:openSUSE:Factory

seems noone cares, so self accept

OBS-URL: https://build.opensuse.org/request/show/56201
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/nasm?expand=0&rev=9
---
 nasm-nodocs.diff | 13 ++++++++++
 nasm.changes     |  6 +++++
 nasm.spec        | 66 +++++-------------------------------------------
 nasmdoc.pdf      |  3 +++
 4 files changed, 29 insertions(+), 59 deletions(-)
 create mode 100644 nasm-nodocs.diff
 create mode 100644 nasmdoc.pdf

diff --git a/nasm-nodocs.diff b/nasm-nodocs.diff
new file mode 100644
index 0000000..2d31638
--- /dev/null
+++ b/nasm-nodocs.diff
@@ -0,0 +1,13 @@
+Index: nasm-2.07/doc/Makefile.in
+===================================================================
+--- nasm-2.07.orig/doc/Makefile.in	2009-07-20 07:22:29.000000000 +0200
++++ nasm-2.07/doc/Makefile.in	2010-12-16 14:23:46.678843306 +0100
+@@ -64,7 +64,7 @@ nasmdoc.ps: nasmdoc.dip nasmlogo.eps $(s
+ nasmdoc.pdf: nasmdoc.ps
+ 	$(ACRODIST) -n -q --nosecurity -o $@ $< || \
+ 	$(PS2PDF) $< $@ || \
+-	$(PSTOPDF) $< -o $@ 
++	$(PSTOPDF) $< -o $@  || true
+ 
+ .PHONY: info
+ info: info/nasm.info
diff --git a/nasm.changes b/nasm.changes
index 6d6f05e..fb66fe2 100644
--- a/nasm.changes
+++ b/nasm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec 16 13:35:07 UTC 2010 - coolo@novell.com
+
+- put the pdf docs into the source rpm to avoid a build cycle with
+  libjpeg. needs to be regenerated on major updates
+
 -------------------------------------------------------------------
 Mon Aug 30 22:49:25 UTC 2010 - cristian.rodriguez@opensuse.org
 
diff --git a/nasm.spec b/nasm.spec
index ac36b1a..18c496b 100644
--- a/nasm.spec
+++ b/nasm.spec
@@ -19,7 +19,8 @@
 
 
 Name:           nasm
-BuildRequires:  ghostscript_any
+# creates build cycle with jpeg-turbo
+# BuildRequires:  ghostscript_any
 Url:            http://nasm.sourceforge.net/
 License:        BSD 2-clause
 Group:          Development/Languages/Other
@@ -28,6 +29,9 @@ Version:        2.07
 Release:        6
 Summary:        Netwide Assembler (An x86 Assembler)
 Source:         nasm-%version.tar.bz2
+Source1:        nasmdoc.pdf
+# FIX-OPENSUSE to avoid a build cycle we need to use the pregenerated pdf
+Patch0:         nasm-nodocs.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -36,37 +40,10 @@ output several binary formats, including ELF, a.out, Win32, and OS/2.
 
 Read the licence agreement in /usr/share/doc/packages/nasm/Licence.
 
-
-
-Authors:
---------
-    Julian Hall <Jules@acris.co.uk>
-    Simon Tatham <anakin@pobox.com>
-    Nelson Rush <palisade@users.sourceforge.net>
-    Frank Kotler <fbkotler@users.sf.net>
-    Stephen Silver <nasm@argentum.freeserve.co.uk>
-    John Coffman <johninsd@users.sourceforge.net>
-    Yuri Zaporogets <yuriz@users.sourceforge.net>
-    H. Peter Anvin <hpa@zytor.com>
-    John Fine <johnfine@earthlink.net>
-    Kendall Bennet <KendallB@scitechsoft.com>
-    Gary Clark
-    Andrew Crabtree
-    Rafael R. Sevilla <dido@pacific.net.ph>
-    Jaime Tejedor GXmez, aka Metalbrain <metalbrain_coder@gmx.net>
-    James Seter <pharos@zsnes.com>
-    Edward J. Beroset <beroset@mindspring.com>
-    Stanislav Karchebny, aka berkus, madfire, daemonhunter <madfire@users.sourceforge.net>
-    Debbie Wiles, aka debs <debs@dwiles.demon.co.uk>
-    Trevor Woerner
-    Michael K. Ter Louw <mterlo1@uic.edu>
-    Martin Wawro
-    Alexei Frounze <alexfru@users.sourceforge.net>
-    Keith Kanios, aka SpooK <keith@kanios.net>
-    Chuck Crayne <ccrayne@users.sourceforge.net>
-
 %prep
 %setup -q
+%patch0 -p1
+cp %{S:1} doc
 
 %package doc
 License:        LGPLv2.1+
@@ -78,35 +55,6 @@ Provides:       nasm:/usr/share/doc/packages/nasm/nasmdoc.pdf
 %description doc
 This package contains the documentation for Nasm.
 
-
-
-Authors:
---------
-    Julian Hall <Jules@acris.co.uk>
-    Simon Tatham <anakin@pobox.com>
-    Nelson Rush <palisade@users.sourceforge.net>
-    Frank Kotler <fbkotler@users.sf.net>
-    Stephen Silver <nasm@argentum.freeserve.co.uk>
-    John Coffman <johninsd@users.sourceforge.net>
-    Yuri Zaporogets <yuriz@users.sourceforge.net>
-    H. Peter Anvin <hpa@zytor.com>
-    John Fine <johnfine@earthlink.net>
-    Kendall Bennet <KendallB@scitechsoft.com>
-    Gary Clark
-    Andrew Crabtree
-    Rafael R. Sevilla <dido@pacific.net.ph>
-    Jaime Tejedor GXmez, aka Metalbrain <metalbrain_coder@gmx.net>
-    James Seter <pharos@zsnes.com>
-    Edward J. Beroset <beroset@mindspring.com>
-    Stanislav Karchebny, aka berkus, madfire, daemonhunter <madfire@users.sourceforge.net>
-    Debbie Wiles, aka debs <debs@dwiles.demon.co.uk>
-    Trevor Woerner
-    Michael K. Ter Louw <mterlo1@uic.edu>
-    Martin Wawro
-    Alexei Frounze <alexfru@users.sourceforge.net>
-    Keith Kanios, aka SpooK <keith@kanios.net>
-    Chuck Crayne <ccrayne@users.sourceforge.net>
-
 %build
 touch -r ./ver.c ./ver.c.stamp
 sed -i -e s@__DATE__@__TIMESTAMP__@ ./ver.c
diff --git a/nasmdoc.pdf b/nasmdoc.pdf
new file mode 100644
index 0000000..ce2fa71
--- /dev/null
+++ b/nasmdoc.pdf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c37b34c7982ca49d7856a35249645e033fac0d7925ada105ebe3d94fc2f111b
+size 693966