Hi
I'm trying to ammend a config file for samhain. Here's my patch file
which I generated by untarring two samhain packages then altering the
samhainrc.linux config file in one then ran diff -uNr samahain
samhain-mine > samhain.patch
I then put these lines in the samhain rpm spec file:
Patch0: samhain-2.0.5b.patch
and ...:
%prep
%setup -q -n samhain-%{version}
%patch -p1
My patch file looks like this:
diff -uNr samhain-2.0.5b/samhainrc.linux samhain-2.0.5b-my/samhainrc.linux
--- samhain-2.0.5b/samhainrc.linux 2004-10-11 08:14:30.000000000 +0100
+++ samhain-2.0.5b-my/samhainrc.linux 2005-05-04 13:03:55.000000000 +0100
@@ -1,669 +1,104 @@
-#####################################################################
-#
-# Configuration file template for samhain.
-#
-#####################################################################
-#
-# -- empty lines and lines starting with '#', ';' or '//' are ignored
etc......
Any Help would be appreciated.
Many Thanks
Shahzad
On 5/4/05, James Kosin <jkosin@xxxxxxxxxxxxxxxxxx> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Shahzad Chohan wrote:
>
> |Hi
> |
> |I'm trying to insert a patch into a rpm spec file. I've read some
> |guides on teh net but I'm still not able to install a patch into the
> |rpm. What occurs once I have built the rpm is that particular file has
> |all the diff changed in it instead of the diff changes being applied
> |to the file. I'm baffled as to what is happening.
> |
> |Any help would be much appreciated.
> |
> |Many Thanks
> |Shahzad
> |
> Shahzad,
>
> I think we need more information:
> ~ (1) What does the patch file look like?
> ~ (2) Be sure you created the patch file with 'diff -urNp' or simular.
> ~ (3) In the %prep seciton you have the ':patchxx -p1' command,
> where xx is the number you assigned to the patch.
> ~ (4) After the Sources you have a Patchxx: <patch-file-name>,
> again where xx is the uniuqe patch number and <patch-file-name> is the
> patch file name located in the SOURCES directory.
>
> Can you send a small snippet of the diff file (patch file), the
> relavent change you made to the .spec file? This information would be
> very valuable in helping.
>
> James Kosin
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.0 (MingW32)
> Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
>
> iD8DBQFCeNwPkNLDmnu1kSkRAhfiAJ9tPvmR4c6DRk6qs6DC6biMR4TZbgCdG5+H
> yexMyIQ0ZJ8wDj/I8mVIA+U=
> =At+H
> -----END PGP SIGNATURE-----
>
>
