Re: Bad news on LEAP fix patch

[Aaron Konstam <akonstam sbcglobal net>]

On Wed, 2007-07-11 at 12:51 -0400, Derek Atkins wrote:
> Aaron Konstam <akonstam sbcglobal net> writes:
> 
> > That is exactly what I did.
> > In the spec file  NetworkManager.spec I had the lines:
> > Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
> > Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
> > Patch2: linkdebug.patch
> > Patch3: NetworkManager-0.6.5-no-killswitch-fix.patch
> > Patch4: NetworkManager-0.6.5-LEAP_passwd.patch
> >
> > And I added the NetworkManager-0.6.5-LEAP_passwd.patch file to the 
> > /usr/src/redhat/SOURCES 
> > directory.
> 
> In the %prep section did you add the appropriate %patchN (where 'N' is
> the PatchN: you added here)?
> 
> > Then I recompiled the rpms by execuuting:
> > rpmbuild -ba  NetworkManager.spec 
> >
> > Does that seem right?
> 
> See above..  It's correct IFF you also added the %patchN
> 
> -derek

Now I am in trouble when I added the line:
%patch4 -p1 -b .LEAP_passwd

and then executed : rpmbuild -ba 

Thhe compiling started but I am stumped by the answer to the question at
the end of this output
--------------------------------------------------------------
+ /bin/chmod -Rf a+rX,u+w,g-w,o-w .
+ echo 'Patch #0 (NetworkManager-0.6.4-startup-dhcdbd.patch):'
Patch #0 (NetworkManager-0.6.4-startup-dhcdbd.patch):
+ patch -p1 -b --suffix .startup-dhcdbd -s
+ echo 'Patch #2 (linkdebug.patch):'
Patch #2 (linkdebug.patch):
+ patch -p1 -b --suffix .linkdebug -s
+ echo 'Patch #3 (NetworkManager-0.6.5-no-killswitch-fix.patch):'
Patch #3 (NetworkManager-0.6.5-no-killswitch-fix.patch):
+ patch -p1 -b --suffix .no-killswitch-fix -s
+ echo 'Patch #4 (NetworkManager-0.6.5-LEAP_passwd.patch):'
Patch #4 (NetworkManager-0.6.5-LEAP_passwd.patch):
+ patch -p1 -b --suffix .LEAP_passwd -s
The text leading up to this was:
--------------------------
|diff -urN NetworkManager-0.6.5/nm-applet-0.6.5/src/applet-dbus-info.c
NetworkManager-0.6.5.new/nm-applet-0.6.5/src/applet-dbus-info.c
|--- NetworkManager-0.6.5/nm-applet-0.6.5/src/applet-dbus-info.c
2007-06-07 17:44:06.000000000 +0100
|+++ NetworkManager-0.6.5.new/nm-applet-0.6.5/src/applet-dbus-info.c
2007-07-06 15:11:16.000000000 +0100
--------------------------
File to patch: 
----------------------------------------------------------------
What am I supposed to enter here or have I gone really astray?

--
=======================================================================
Q: What lies on the bottom of the ocean and twitches? A: A nervous
wreck.
=======================================================================
Aaron Konstam telephone: (210) 656-0355 e-mail: akonstam sbcglobal net