osc copypac from project:home:pgajdos package:nasm revision:3

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/nasm?expand=0&rev=10

nasm-nodocs.diff

@@ -1,13 +0,0 @@
-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

nasm.changes

@@ -1,8 +1,9 @@
 -------------------------------------------------------------------
-Thu Dec 16 13:35:07 UTC 2010 - coolo@novell.com
+Fri Dec 17 10:50:19 CET 2010 - pgajdos@suse.cz
 
-- put the pdf docs into the source rpm to avoid a build cycle with
-  libjpeg. needs to be regenerated on major updates
+- don't include pdf in documentation, remove ghostscript from
+  build requires to break dependency cycle (jpeg-turbo needs
+  nasm for build)
 
 -------------------------------------------------------------------
 Mon Aug 30 22:49:25 UTC 2010 - cristian.rodriguez@opensuse.org

nasm.spec

@@ -19,8 +19,6 @@
 
 
 Name:           nasm
-# creates build cycle with jpeg-turbo
-# BuildRequires:  ghostscript_any
 Url:            http://nasm.sourceforge.net/
 License:        BSD 2-clause
 Group:          Development/Languages/Other
@@ -29,9 +27,6 @@ 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
@@ -40,10 +35,37 @@ 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+
@@ -55,27 +77,60 @@ 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
 touch -r ./ver.c.stamp ./ver.c
 %configure
-make %{?jobs:-j%jobs} all doc
+make all
+cd doc
+make html info nasmdoc.ps nasmdoc.txt
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT/usr/bin
 install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man1
 install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm
 install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm/rdoff
+install -d -m 755 $RPM_BUILD_ROOT/%{_docdir}/nasm/html
 install -d -m 755 $RPM_BUILD_ROOT/%{_infodir}
-make INSTALLROOT=$RPM_BUILD_ROOT install_everything docdir=%{_docdir}/nasm
-make INSTALLROOT=$RPM_BUILD_ROOT install_doc docdir=%{_docdir}/nasm
-install -m 644 AUTHORS CHANGES ChangeLog LICENSE INSTALL TODO README \
+make INSTALLROOT=$RPM_BUILD_ROOT install
+make INSTALLROOT=$RPM_BUILD_ROOT rdf_install
+install -m 644 AUTHORS CHANGES ChangeLog LICENSE TODO README doc/*.txt \
 	$RPM_BUILD_ROOT/%{_docdir}/nasm
 install -m 644 rdoff/README rdoff/doc/* \
 	$RPM_BUILD_ROOT/%{_docdir}/nasm/rdoff
-rm -f $RPM_BUILD_ROOT/%_docdir/nasm/*.ps
-rm -f %buildroot%{_docdir}/nasm/INSTALL
+install -m 644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/nasm/html
+install -m 644 ndisasm.1 nasm.1 rdoff/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 644 doc/info/* $RPM_BUILD_ROOT%{_infodir}
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;

nasmdoc.pdf

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c37b34c7982ca49d7856a35249645e033fac0d7925ada105ebe3d94fc2f111b
-size 693966