rpms/mknbi/devel mknbi-1.4.4-gcc4.patch, NONE, 1.1 mknbi-1.4.4-makefile-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mknbi.spec, 1.7, 1.8 sources, 1.2, 1.3 mknbi-makefile-optflags.patch, 1.1, NONE

[Dams Nade (anvil)]

Author: anvil

Update of /cvs/extras/rpms/mknbi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23288

Modified Files:
	.cvsignore mknbi.spec sources 
Added Files:
	mknbi-1.4.4-gcc4.patch mknbi-1.4.4-makefile-optflags.patch 
Removed Files:
	mknbi-makefile-optflags.patch 
Log Message:
mknbi: Updated to 1.4.4. gcc4 fix.

mknbi-1.4.4-gcc4.patch:

--- NEW FILE mknbi-1.4.4-gcc4.patch ---
--- nfl.c.orig	2005-05-01 22:30:06.000000000 +0200
+++ nfl.c	2005-05-01 22:31:10.000000000 +0200
@@ -124,7 +124,7 @@
 static unsigned short menu_cols = 0x0800;
 
 /* Terminal types.  */
-static int terminal = TERMINAL_CONSOLE;
+int terminal = TERMINAL_CONSOLE;
 
 /* Defined in ANSI.C */
 extern unsigned short rows, columns, attr;

mknbi-1.4.4-makefile-optflags.patch:

--- NEW FILE mknbi-1.4.4-makefile-optflags.patch ---
--- Makefile.orig	2005-05-01 22:14:30.000000000 +0200
+++ Makefile	2005-05-01 22:15:39.000000000 +0200
@@ -17,8 +17,7 @@
 # This one makes multiple versions
 FIRSTRELOCS=	0x92800 0x82800
 OLDGAS:=	$(shell $(AS) --version | grep -q '2\.9\.1' && echo -DGAS291)
-CFLAGS=		-I. -Os -ffreestanding -fstrength-reduce -fomit-frame-pointer \
-		-mcpu=i386 \
+CFLAGS=		-I. $(RPM_OPT_FLAGS) -ffreestanding -fstrength-reduce -fomit-frame-pointer \
 		-Wall -W -Wno-format -Wno-unused -DVERSION=\"$(VERSION)$(EXTRAVERSION)\"
 LDBINARYFLAG=	--oformat binary
 FIRST32SIZE=	6144


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mknbi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:52:22 -0000	1.2
+++ .cvsignore	1 May 2005 20:41:19 -0000	1.3
@@ -1 +1 @@
-mknbi-1.4.0.tar.gz
+mknbi-1.4.4.tar.gz


Index: mknbi.spec
===================================================================
RCS file: /cvs/extras/rpms/mknbi/devel/mknbi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mknbi.spec	6 Apr 2005 22:12:41 -0000	1.7
+++ mknbi.spec	1 May 2005 20:41:19 -0000	1.8
@@ -1,13 +1,14 @@
 Summary: 	Utility for creating network bootable images
 Name: 		mknbi
-Version:	1.4.0
-Release: 	5
+Version:	1.4.4
+Release: 	1
 
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://etherboot.sourceforge.net/
 Source0: 	http://dl.sf.net/etherboot/%{name}-%{version}.tar.gz
-Patch1:		mknbi-makefile-optflags.patch
+Patch0:		mknbi-1.4.4-gcc4.patch
+Patch1:		mknbi-1.4.4-makefile-optflags.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	perl
 ExclusiveArch:	%{ix86}
@@ -21,18 +22,17 @@
 
 %prep
 %setup -q
-%patch1 -p0
-mv Makefile Makefile.old
-sed "s:/usr/local:%{_prefix}:g" Makefile.old > Makefile
+%patch0 -p0 -b .gcc4
+%patch1 -p0 -b .optflags
 
 %build
 make realclean
-make %{?_smp_mflags}
+make %{?_smp_mflags} PREFIX=%{_prefix} 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT/%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1
-rm -Rf $RPM_BUILD_ROOT/%{_prefix}/doc/mknbi*
+make install BUILD_ROOT=$RPM_BUILD_ROOT PREFIX=%{_prefix} 
+rm -Rf $RPM_BUILD_ROOT%{_docdir}/packages/mknbi*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +51,11 @@
 %{_mandir}/man1/mknbi.1*
 
 %changelog
+* Sun May  1 2005 Dams <anvil[AT]livna.org> - 1.4.4-1
+- Updated to 1.4.4
+- Patch for gcc4 fix
+- Updated patch1
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mknbi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:52:22 -0000	1.2
+++ sources	1 May 2005 20:41:19 -0000	1.3
@@ -1 +1 @@
-c2850bc359fd1c7a9d14cd4d04b975b8  mknbi-1.4.0.tar.gz
+5ddafef0a582cfb2b3cd30951662e6e2  mknbi-1.4.4.tar.gz


--- mknbi-makefile-optflags.patch DELETED ---