rpms/busybox/devel busybox-1.6.1-st_err.patch, NONE, 1.1 busybox.spec, 1.61, 1.62 busybox-1.5.1-selinux.patch, 1.1, NONE

[Ivana Varekova (varekova)]

Author: varekova

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

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.6.1-st_err.patch 
Removed Files:
	busybox-1.5.1-selinux.patch 
Log Message:
update to 1.6.1


busybox-1.6.1-st_err.patch:

--- NEW FILE busybox-1.6.1-st_err.patch ---
--- busybox-1.6.1/applets/applets.c.pom	2007-06-30 17:06:47.000000000 +0200
+++ busybox-1.6.1/applets/applets.c	2007-07-23 09:41:56.000000000 +0200
@@ -23,7 +23,7 @@
 #warning Note that glibc is unsuitable for static linking anyway.
 #warning If you still want to do it, remove -Wl,--gc-sections
 #warning from top-level Makefile and remove this warning.
-#error Aborting compilation.
+//#error Aborting compilation.
 #endif
 
 


Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- busybox.spec	1 Jun 2007 11:48:52 -0000	1.61
+++ busybox.spec	23 Jul 2007 08:22:48 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.5.1
-Release: 2%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
@@ -9,13 +9,13 @@
 Source1: busybox-petitboot.config
 Patch: busybox-1.5.1-static.patch
 Patch1: busybox-1.5.1-anaconda.patch
-Patch2: busybox-1.5.1-selinux.patch
 Patch4: busybox-1.2.0-ppc64.patch
 Patch9: busybox-1.5.1-tar.patch
 Patch11: busybox-1.2.2-iptunnel.patch
 Patch12: busybox-1.2.2-ls.patch
 Patch13: busybox-1.5.1-clean.patch
 Patch14: busybox-1.5.1-msh.patch
+Patch15: busybox-1.6.1-st_err.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -55,7 +55,6 @@
 %setup -q
 %patch13 -b .clean -p1
 #SELINUX Patch
-%patch2 -b .selinux -p1
 %patch -b .static -p1
 %ifarch ppc64
 #%patch4 -b .ppc64 -p1
@@ -64,12 +63,12 @@
 %patch11 -b .iptunnel -p1
 %patch12 -b .ls -p1
 %patch14 -b .msh -p1
+%patch15 -b .st_err -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
 make defconfig
 make CC="gcc $RPM_OPT_FLAGS"
-ls -la
 cp busybox busybox-static
 make clean
 
@@ -116,6 +115,9 @@
 /sbin/busybox.petitboot
 
 %changelog
+* Mon Jul 23 2007 Ivana Varekova <varekova at redhat.com> - 1:1.6.1-1
+- update to 1.6.1
+
 * Fri Jun  1 2007 Ivana Varekova <varekova at redhat.com> - 1:1.5.1-2
 - add msh shell
 


--- busybox-1.5.1-selinux.patch DELETED ---