Fedora Linux Support Community & Resources Center
  #1  
Old 27th December 2009, 02:02 PM
jakev383 Offline
Registered User
 
Join Date: Apr 2006
Posts: 29
linuxubuntufirefox
Proper switches for diff

So F12 (and soon F13) now use a stricter method of applying patches in RPM files.
I'm going to go back and re-diff a lot of my software, but what are the proper switches to create the patch files? All of the other distros are fine with using the defaults, but I would like to make sure I'm making a forward motion since the new method will be stricter.
Thanks.
Reply With Quote
  #2  
Old 27th December 2009, 03:15 PM
Dies Offline
Registered User
 
Join Date: Oct 2006
Posts: 4,754
linuxfedorafirefox
There's no difference that I've come across.

Unless you point to a specific package or patch, it's doubtful that anyone can help since no one actually has a clue as to what exactly it is you're doing.

You have another post

http://forums.fedoraforum.org/showthread.php?t=237315

But it's still not helpful. The patch you're applying to all these different source rpms, is the software in these source rpms exactly the same? Same version, same set of default patches, etc. ?

Without knowing that any answer you might get is just a guess.
Reply With Quote
  #3  
Old 27th December 2009, 03:36 PM
jakev383 Offline
Registered User
 
Join Date: Apr 2006
Posts: 29
linuxubuntufirefox
Yes, the software is exactly the same.
The SRPM compiles fine on F9, F10, and F11. When I copy it to F12, it does not compile. I wanted to know if there was something obvious that was a common thing that had changed, and in this particular thread I wanted to know if there was a switch difference in diff that needed to be utilized instead.
Reply With Quote
  #4  
Old 27th December 2009, 03:43 PM
Dies Offline
Registered User
 
Join Date: Oct 2006
Posts: 4,754
linuxfedorafirefox
Like I said, nothing that I've come across.

diff -ruN

is what I ( everybody? ) tend to use the most.
Reply With Quote
  #5  
Old 28th December 2009, 02:14 PM
jakev383 Offline
Registered User
 
Join Date: Apr 2006
Posts: 29
linuxubuntufirefox
Then you'll understand my confusion after reading this link:
http://lwn.net/Articles/289235/
Particularly after reading #2 under the Packagers section.
Or should I just assume that it will work because you say so?
Reply With Quote
  #6  
Old 28th December 2009, 05:23 PM
Dies Offline
Registered User
 
Join Date: Oct 2006
Posts: 4,754
linuxfedorafirefox
Quote:
Originally Posted by jakev383 View Post
Then you'll understand my confusion after reading this link:
http://lwn.net/Articles/289235/
Particularly after reading #2 under the Packagers section.
Or should I just assume that it will work because you say so?
No but maybe you should re-read it.

It clearly suggests that you re-diff ( without mentioning any magical switches to use ). It also goes on to state that using fuzz=2 is the same as the default patch command which according to you fails as well.

But hey, if you choose to believe that the Fedora developers are silly enough to break the diff command completely then that's your choice. Instead of taking a little time to re-diff your patches, or filing a bug, just wait for someone here to tell you what you would like to hear. I'm sure that will get your package built faster.
Reply With Quote
  #7  
Old 29th December 2009, 04:05 PM
jakev383 Offline
Registered User
 
Join Date: Apr 2006
Posts: 29
linuxfedorafirefox
And in my original post I stated that I was going to re-diff the packages but was inquiring if there was a special or preferred way of diff'ing them for Fedora.
I was trying to see if others had followed the same road and inquire if there were any obstacles along the way (ie: different switches) that I could be saved from hitting myself. (And didn't is say that the default will now be fuzz 0?)
Guess the consensus is that we should all have to work on the same obstacles and not share our experiences with others to avoid them.
Thanks for your insightful reply.
Reply With Quote
  #8  
Old 29th December 2009, 07:17 PM
vallimar Offline
Registered User
 
Join Date: Jul 2008
Posts: 1,042
windows_xp_2003safari
If you want to know the Fedora approved methodology, read the Package Maintainers / Creators guides/sections/whatever from the Fedora website. I don't know, but would imagine the most approved method for patch creation for rpm's is using the gendiff script available in the rpm-build package. That script pretty much uses diff -up file1 file2. File1 is replaced with /dev/null when there is a new file, which is similar to doing diff -Nup.
Reply With Quote
  #9  
Old 29th December 2009, 08:10 PM
Dies Offline
Registered User
 
Join Date: Oct 2006
Posts: 4,754
linuxfedorafirefox
Quote:
Originally Posted by jakev383 View Post
And in my original post I stated that I was going to re-diff the packages but was inquiring if there was a special or preferred way of diff'ing them for Fedora.
I was trying to see if others had followed the same road and inquire if there were any obstacles along the way (ie: different switches) that I could be saved from hitting myself. (And didn't is say that the default will now be fuzz 0?)
Guess the consensus is that we should all have to work on the same obstacles and not share our experiences with others to avoid them.
Thanks for your insightful reply.
Really? Are you serious? The first thing I did was tell you that there wasn't.

You choose not to believe that ( because of some seriously outdated article that would have also affected previous versions of Fedora ) so I'm a jerk?

Yeah, that makes sense.

Oh yeah, btw, "our experiences" in this case are shared by default, they're called source rpms...

Anyways, good luck.
Reply With Quote
Reply

Tags
diff, proper, switches

Thread Tools Search this Thread
Search this Thread:

Advanced Search
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump

Similar Threads
Thread Thread Starter Forum Replies Last Post
Assigning diff languages to diff users deacky_blue Using Fedora 2 17th February 2009 01:07 PM
help w/some mv or cp switches schwim Linux Chat 16 30th November 2007 03:42 AM
KVM Switches keeler1 Wibble 1 13th August 2007 11:12 PM
Gmplayer Switches jim Using Fedora 1 18th May 2005 07:46 PM
KVM Switches JaSb Using Fedora 6 6th November 2004 01:44 AM


Current GMT-time: 08:42 (Tuesday, 29-07-2014)

TopSubscribe to XML RSS for all Threads in all ForumsFedoraForumDotOrg Archive
logo

All trademarks, and forum posts in this site are property of their respective owner(s).
FedoraForum.org is privately owned and is not directly sponsored by the Fedora Project or Red Hat, Inc.

Privacy Policy | Term of Use | Posting Guidelines | Archive | Contact Us | Founding Members

Powered by vBulletin® Copyright ©2000 - 2012, vBulletin Solutions, Inc.

FedoraForum is Powered by RedHat