[CentOS] rpm - diff and patch updating

2010-06-15 Thread Frank Cox
I am attempting to create a rpm of the latest version of a program. The rpm for the previous version contains a number of patch files that make numerous changes various files in the tar.gz as downloaded from the project's website so it will work properly on Linux. The latest version of the

Re: [CentOS] rpm - diff and patch updating

2010-06-15 Thread John Doe
From: Frank Cox thea...@sasktel.net ... some of the files that need to be patched have had some stuff moved around a bit, just enough to (apparently) cause patch to fail... ... By way of experimentation, I manually changed one of the files ... is there a way to automate the process... I am

[CentOS] rpm - diff and patch updating

2010-06-15 Thread R P Herrold
On Tue, 15 Jun 2010, Frank Cox wrote: By way of experimentation, I manually changed one of the files in the new version to match what the patch says it should be, then created a new patch file from that and it applies and appears to work fine. (I patched the previous version's file, compared

Re: [CentOS] rpm - diff and patch updating

2010-06-15 Thread Les Mikesell
Frank Cox wrote: I am attempting to create a rpm of the latest version of a program. The rpm for the previous version contains a number of patch files that make numerous changes various files in the tar.gz as downloaded from the project's website so it will work properly on Linux. The

Re: [CentOS] rpm - diff and patch updating

2010-06-15 Thread Frank Cox
On Tue, 2010-06-15 at 02:44 -0700, John Doe wrote: I am afraid patch is not able to auto-magicaly adapt an old patch to a heavily modified file... That's what I was afraid of. I was hoping, however, that there might be some way to verify that everything in the patch has now been done in the

Re: [CentOS] rpm - diff and patch updating

2010-06-15 Thread Frank Cox
On Tue, 2010-06-15 at 08:55 -0400, R P Herrold wrote: First, am I going about this the right way? no -- Usually one unrolls the old tree, applies the patches to the old; and then unrolls the new in a directory 'next to' the first, and diffs from a point above the top of each What would

[CentOS] rpm - diff and patch updating

2010-06-15 Thread R P Herrold
On Tue, 15 Jun 2010, Frank Cox wrote: On Tue, 2010-06-15 at 08:55 -0400, R P Herrold wrote: First, am I going about this the right way? no -- Usually one unrolls the old tree, applies the patches to the old; and then unrolls the new in a directory 'next to' the first, and diffs from a point

Re: [CentOS] rpm - diff and patch updating

2010-06-15 Thread Frank Cox
On Tue, 2010-06-15 at 12:17 -0400, R P Herrold wrote: The point is to see where changes are happening, and to be able to cherry pick in a migration toward the latest [but being able to spot the deltas from the prior version], which, as I understood it, was your goal I can see that.

[CentOS] rpm - diff and patch updating

2010-06-15 Thread R P Herrold
On Tue, 15 Jun 2010, Frank Cox wrote: A single monolithic diff of the entire tree would lose this functional separation of the patches, and it would be a lot more maintainable and understandable into the future if I could retain that instead. time for training of that Mk I eyeball ;) some

Re: [CentOS] rpm - diff and patch updating

2010-06-15 Thread Todd Denniston
Frank Cox wrote, On 06/15/2010 11:51 AM: On Tue, 2010-06-15 at 02:44 -0700, John Doe wrote: I am afraid patch is not able to auto-magicaly adapt an old patch to a heavily modified file... That's what I was afraid of. I was hoping, however, that there might be some way to verify that

Re: [CentOS] rpm - diff and patch updating

2010-06-15 Thread Frank Cox
On Tue, 2010-06-15 at 13:06 -0400, Todd Denniston wrote: Where did the original SRPM come from? rpmfusion. What was it of/for? vice-2.1-3.src.rpm Does the original source repository/group exist anymore? ... someone else may have already been here with the product you are looking at. I

Re: [CentOS] rpm - diff and patch updating

2010-06-15 Thread Frank Cox
On Tue, 2010-06-15 at 12:17 -0400, R P Herrold wrote: The point is to see where changes are happening, and to be able to cherry pick in a migration toward the latest [but being able to spot the deltas from the prior version], which, as I understood it, was your goal I just found the

[CentOS] rpm - diff and patch updating

2010-06-15 Thread R P Herrold
On Tue, 15 Jun 2010, Frank Cox wrote: I just found the slickest tool to compare files. meld yum install meld will get it for you from the epel repository. I did not know that Mr. Spock had brought that back from Vulcan; next think you know the secret of the nerve pinch will be revealed

Re: [CentOS] rpm - diff and patch updating

2010-06-15 Thread Steven Vishoot
- Original Message From: R P Herrold herr...@centos.org To: CentOS mailing list centos@centos.org Sent: Tue, June 15, 2010 4:14:03 PM Subject: [CentOS] rpm - diff and patch updating On Tue, 15 Jun 2010, Frank Cox wrote: I just found the slickest tool to compare files