From 48a6f77d823ad8596dcf1c218b51584100335d7d Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 07:32:24 +0100
Subject: [PATCH] no longer obsolete nasm-doc [release 2.16.01-2mamba;Sun Jan
 15 2023]

---
 nasm.spec | 121 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 65 insertions(+), 56 deletions(-)

diff --git a/nasm.spec b/nasm.spec
index 14ee991..797148d 100644
--- a/nasm.spec
+++ b/nasm.spec
@@ -1,26 +1,22 @@
 Name:          nasm
-Version:       2.14.02
-Release:       1mamba
+Version:       2.16.01
+Release:       2mamba
 Summary:       The Netwide Assembler, a portable x86 assembler with Intel-like syntax
 Group:         Development/Tools
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      Aleph0 <aleph0@openmamba.org>
-URL:           http://sf.net/projects/nasm/
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           https://sourceforge.net/projects/nasm/
 Source:        http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.xz
 Patch0:        nasm-2.10.09-fix-texi-rdoff.patch
 License:       LGPL
-Requires(post):%{__install_info}
-Obsoletes:     nasm-doc
-Provides:      nasm-doc = %{?epoch:%epoch:}%{version}-%{release}
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: perl-Sort-Versions
 ## AUTOBUILDREQ-END
+Requires(post):%{__install_info}
 %if "%{stage1}" != "1"
 BuildRequires: tetex
 %endif
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 NASM is the Netwide Assembler, a free portable assembler for the Intel 80x86 microprocessor series, using primarily the traditional Intel instruction mnemonics and syntax.
@@ -33,16 +29,18 @@ Group:         Development/Tools
 Tools for the operating-system independent RDOFF binary format, which is sometimes used with the Netwide #Assembler (NASM).
 These tools include linker, library manager, loader, and information dump.
 
-#%package doc
-#Summary:       Extensive documentation for NASM
-#Group:         Development/Languages
-#
-#%description doc
-#Extensive documentation for the Netwide Assembler, NASM, in HTML, info, PostScript and text formats.
+%package doc
+Summary:       Extensive documentation for NASM
+Group:         Development/Languages
+
+%description doc
+Extensive documentation for the Netwide Assembler, NASM, in HTML, info, PostScript and text formats.
+
+%debug_package
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 
 ./autogen.sh
 
@@ -52,69 +50,80 @@ These tools include linker, library manager, loader, and information dump.
 
 %if "%{stage1}" != "1"
 #make -C doc nasmdoc.dvi
-make -C rdoff/doc info html pdf
+make -C doc
+#info html pdf
 %endif
 
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 install -d %{buildroot}{%_bindir,%_mandir/man1,%_infodir}
 
-%makeinstall INSTALLROOT=%{buildroot}
-%makeinstall INSTALLROOT=%{buildroot} install_rdf
+%makeinstall INSTALLROOT=%{buildroot} install_everything \
+   htmldir=%{_docdir}/nasm/html \
+   docdir=%{_docdir}/nasm
+#% makeinstall INSTALLROOT=%{buildroot} install_rdf
 
-%if "%{stage1}" != "1"
-install -d %{buildroot}%{_prefix}/tempdoc
-%makeinstall -C doc docdir=%{_docdir}/nasm
-
-install -D -m644 rdoff/doc/rdoff.info \
-   %{buildroot}/%{_infodir}/rdoff.info
-#gzip -9f rdoff/doc/*.txt
-%endif
+#%if "%{stage1}" != "1"
+#install -d %{buildroot}%{_prefix}/tempdoc
+#%makeinstall -C doc docdir=%{_docdir}/nasm
+#
+##install -D -m644 rdoff/doc/rdoff.info \
+##   %{buildroot}/%{_infodir}/rdoff.info
+##gzip -9f rdoff/doc/*.txt
+#%endif
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
-%if "%{stage1}" != "1"
-%post rdoff
-%install_info rdoff.info
-exit 0
-
-%preun rdoff
-%uninstall_info rdoff.info
-exit 0
-%endif
+#%if "%{stage1}" != "1"
+#%post rdoff
+#%install_info rdoff.info
+#:
+#
+#%preun rdoff
+#%uninstall_info rdoff.info
+#:
+#%endif
 
 %files
 %defattr(-,root,root)
 %{_bindir}/nasm
 %{_bindir}/ndisasm
 %{_mandir}/man1/*
-%dir %{_docdir}/nasm
-%{_docdir}/nasm/*
 %doc AUTHORS LICENSE
 #%doc ChangeLog CHANGES README TODO
 
-%files rdoff
-%defattr(-,root,root)
-%{_bindir}/ldrdf
-%{_bindir}/rdf2bin
-%{_bindir}/rdf2com
-%{_bindir}/rdf2ihx
-%{_bindir}/rdf2ith
-%{_bindir}/rdf2srec
-%{_bindir}/rdfdump
-%{_bindir}/rdflib
-%{_bindir}/rdx
-%if "%{stage1}" != "1"
-%{_infodir}/rdoff.info.*
-##%doc rdoff/doc/rdoff rdoff/doc/*.txt rdoff/doc/rdoff.pdf
-%endif
-
-#%files doc
+#%files rdoff
 #%defattr(-,root,root)
-#%doc html nasmdoc.txt.gz nasmdoc.pdf
+#%{_bindir}/ldrdf
+#%{_bindir}/rdf2bin
+#%{_bindir}/rdf2com
+#%{_bindir}/rdf2ihx
+#%{_bindir}/rdf2ith
+#%{_bindir}/rdf2srec
+#%{_bindir}/rdfdump
+#%{_bindir}/rdflib
+#%{_bindir}/rdx
+##%if "%{stage1}" != "1"
+##%{_infodir}/rdoff.info.*
+####%doc rdoff/doc/rdoff rdoff/doc/*.txt rdoff/doc/rdoff.pdf
+##%endif
+
+%files doc
+%defattr(-,root,root)
+%dir %{_docdir}/nasm
+%dir %{_docdir}/nasm/html
+%{_docdir}/nasm/html/*
+%dir %{_docdir}/nasm
+%{_docdir}/nasm/*
 
 %changelog
+* Sun Jan 15 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 2.16.01-2mamba
+- no longer obsolete nasm-doc
+
+* Sat Jan 14 2023 Automatic Build System <autodist@mambasoft.it> 2.16.01-1mamba
+- automatic version update by autodist
+
 * Sat Aug 17 2019 Automatic Build System <autodist@mambasoft.it> 2.14.02-1mamba
 - automatic version update by autodist