From c6f2c1081be214bc982881da532e1f99d67dc80cfd5a200a35ca1cdb8f874641 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 6 Jan 2011 10:11:18 +0000 Subject: [PATCH 1/2] 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 - Simon Tatham - Nelson Rush - Frank Kotler - Stephen Silver - John Coffman - Yuri Zaporogets - H. Peter Anvin - John Fine - Kendall Bennet - Gary Clark - Andrew Crabtree - Rafael R. Sevilla - Jaime Tejedor GXmez, aka Metalbrain - James Seter - Edward J. Beroset - Stanislav Karchebny, aka berkus, madfire, daemonhunter - Debbie Wiles, aka debs - Trevor Woerner - Michael K. Ter Louw - Martin Wawro - Alexei Frounze - Keith Kanios, aka SpooK - Chuck Crayne - %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 - Simon Tatham - Nelson Rush - Frank Kotler - Stephen Silver - John Coffman - Yuri Zaporogets - H. Peter Anvin - John Fine - Kendall Bennet - Gary Clark - Andrew Crabtree - Rafael R. Sevilla - Jaime Tejedor GXmez, aka Metalbrain - James Seter - Edward J. Beroset - Stanislav Karchebny, aka berkus, madfire, daemonhunter - Debbie Wiles, aka debs - Trevor Woerner - Michael K. Ter Louw - Martin Wawro - Alexei Frounze - Keith Kanios, aka SpooK - Chuck Crayne - %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 From a015d1786ce18b250c8b35d5f27bb1e3b33a5eae2d21f2857ff6e777d087179b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 10 Jan 2011 09:45:32 +0000 Subject: [PATCH 2/2] 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 | 13 -------- nasm.changes | 7 +++-- nasm.spec | 81 ++++++++++++++++++++++++++++++++++++++++-------- nasmdoc.pdf | 3 -- 4 files changed, 72 insertions(+), 32 deletions(-) delete mode 100644 nasm-nodocs.diff delete mode 100644 nasmdoc.pdf diff --git a/nasm-nodocs.diff b/nasm-nodocs.diff deleted file mode 100644 index 2d31638..0000000 --- a/nasm-nodocs.diff +++ /dev/null @@ -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 diff --git a/nasm.changes b/nasm.changes index fb66fe2..fd1dd07 100644 --- a/nasm.changes +++ b/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 diff --git a/nasm.spec b/nasm.spec index 18c496b..e0ae314 100644 --- a/nasm.spec +++ b/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 + Simon Tatham + Nelson Rush + Frank Kotler + Stephen Silver + John Coffman + Yuri Zaporogets + H. Peter Anvin + John Fine + Kendall Bennet + Gary Clark + Andrew Crabtree + Rafael R. Sevilla + Jaime Tejedor GXmez, aka Metalbrain + James Seter + Edward J. Beroset + Stanislav Karchebny, aka berkus, madfire, daemonhunter + Debbie Wiles, aka debs + Trevor Woerner + Michael K. Ter Louw + Martin Wawro + Alexei Frounze + Keith Kanios, aka SpooK + Chuck Crayne + %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 + Simon Tatham + Nelson Rush + Frank Kotler + Stephen Silver + John Coffman + Yuri Zaporogets + H. Peter Anvin + John Fine + Kendall Bennet + Gary Clark + Andrew Crabtree + Rafael R. Sevilla + Jaime Tejedor GXmez, aka Metalbrain + James Seter + Edward J. Beroset + Stanislav Karchebny, aka berkus, madfire, daemonhunter + Debbie Wiles, aka debs + Trevor Woerner + Michael K. Ter Louw + Martin Wawro + Alexei Frounze + Keith Kanios, aka SpooK + Chuck Crayne + %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; diff --git a/nasmdoc.pdf b/nasmdoc.pdf deleted file mode 100644 index ce2fa71..0000000 --- a/nasmdoc.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c37b34c7982ca49d7856a35249645e033fac0d7925ada105ebe3d94fc2f111b -size 693966