rpms/nasm/devel .cvsignore, 1.8, 1.9 nasm.spec, 1.21, 1.22 sources, 1.8, 1.9 nasm-0.98-boguself2.patch, 1.3, NONE nasm-0.98.39-overfl.patch, 1.1, NONE

[Petr Machata (pmachata)]

Author: pmachata

Update of /cvs/pkgs/rpms/nasm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2075

Modified Files:
	.cvsignore nasm.spec sources 
Removed Files:
	nasm-0.98-boguself2.patch nasm-0.98.39-overfl.patch 
Log Message:
- rebase to a new stable upstream version 2.01



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nasm/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Mar 2005 13:31:00 -0000	1.8
+++ .cvsignore	29 Jan 2008 16:41:22 -0000	1.9
@@ -1,2 +1,4 @@
 nasm-0.98.38.tar.bz2
 nasm-0.98.39.tar.bz2
+nasm-2.01.tar.bz2
+nasm-2.01-xdoc.tar.bz2


Index: nasm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nasm/devel/nasm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nasm.spec	13 Apr 2007 19:52:24 -0000	1.21
+++ nasm.spec	29 Jan 2008 16:41:22 -0000	1.22
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 Summary: A portable x86 assembler which uses Intel-like syntax
 Name: nasm
-Version: 0.98.39
-Release: 5%{?dist}
+Version: 2.01
+Release: 1%{?dist}
 License: LGPL
 Group: Development/Languages
 URL: http://nasm.sourceforge.net/
-Source: nasm-%{version}.tar.bz2
-Patch0: nasm-0.98-boguself2.patch
-Patch1: nasm-0.98.39-overfl.patch
+Source0: nasm-%{version}.tar.bz2
+Source1: nasm-%{version}-xdoc.tar.bz2
 BuildRequires: perl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
@@ -39,25 +38,20 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+tar xjf %{SOURCE1} --strip-components 1
 
 %build
 %configure
-make everything CFLAGS="$RPM_OPT_FLAGS -I. -I`pwd` -ansi -pedantic"
+make everything
+gzip -9f doc/nasmdoc.{ps,txt}
 
 %install
-rm -fr $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT/%{_infodir}
-mkdir -p $RPM_BUILD_ROOT/usr/tempdoc
-%makeinstall install_everything docdir=$RPM_BUILD_ROOT/usr/tempdoc
-cp -a $RPM_BUILD_ROOT/usr/tempdoc/html $RPM_BUILD_ROOT/usr/tempdoc/nasmdoc.{ps,txt,pdf} .
-gzip -9f nasmdoc.{ps,txt}
-# remove unpackaged files from the buildroot
-rm -rf $RPM_BUILD_ROOT%{_prefix}/tempdoc
-rm -f $RPM_BUILD_ROOT%{_bindir}/rdf2ihx
+make INSTALLROOT=$RPM_BUILD_ROOT install install_rdf
+install -d $RPM_BUILD_ROOT/%{_infodir}
+install -t $RPM_BUILD_ROOT/%{_infodir} doc/info/*
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -80,18 +74,22 @@
 
 %files doc
 %defattr(-,root,root)
-%doc html nasmdoc.txt.gz nasmdoc.ps.gz
+%doc doc/html doc/nasmdoc.txt.gz doc/nasmdoc.ps.gz
 
 %files rdoff
 %defattr(-,root,root)
 %{_bindir}/ldrdf
 %{_bindir}/rdf2bin
+%{_bindir}/rdf2ihx
 %{_bindir}/rdf2com
 %{_bindir}/rdfdump
 %{_bindir}/rdflib
 %{_bindir}/rdx
 
 %changelog
+* Tue Jan 29 2008 Petr Machata <pmachata at redhat.com> - 2.01-1
+- rebase to a new stable upstream version 2.01
+
 * Wed Feb  7 2007 Petr Machata <pmachata at redhat.com> - 0.98.39-5
 - tidy up the specfile per rpmlint comments
 - use utf-8 and fix national characters in contributor's names


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nasm/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Mar 2005 13:31:00 -0000	1.8
+++ sources	29 Jan 2008 16:41:22 -0000	1.9
@@ -1 +1,2 @@
-2032ad44c7359f7a9a166a40a633e772  nasm-0.98.39.tar.bz2
+93384e87a452607c8d4ce533939295bd  nasm-2.01.tar.bz2
+9cbbe96be3ab546d12e82d2bc1491326  nasm-2.01-xdoc.tar.bz2


--- nasm-0.98-boguself2.patch DELETED ---


--- nasm-0.98.39-overfl.patch DELETED ---