https://bugs.contribs.org/show_bug.cgi?id=10622

--- Comment #46 from John Crisp <[email protected]> ---
Pretty good effort, but the diff needs to be run from the top dir.

So, cd smecontribs/rpms/phpki/contribs9
make clean;make prep

We now have a patched tree. Copy that to .old

cp -r phpki phpki.old

Make changes in phpki/phpki-0.82/wherever

Now go BACK up to smecontribs/rpms/phpki/contribs9 to do you diff.

So you are effectively doing a diff on:

diff -ruN ~/smecontribs/rpms/phpki/contribs9/phpki.old
~/smecontribs/rpms/phpki/contribs9/pkpki > phpki-0.82-fix-preg_match.patch

Then in your spec change:
%define release 19

Add:
Patch20: phpki-0.82-fix-preg_match.patch

Add:
%changelog
* Sat Nov 17 2018 Terry Fage <[email protected]> 0.82-19.sme
- Fix preg_match warnings [SME:10622]

Add:
patch20 -p1

Then make mockbuild and see if you get any errors - if you try it with your
patch you will see it barfs because the directories are slightly wrong.


If you have dev access you then do:

csv add phpki-0.82-fix-preg_match.patch
make commit;make tag;make build

==============================================

Tagged with: phpki-0_82-19_el6_sme

/usr/bin/plague-client build phpki phpki-0_82-19_el6_sme contribs9
Package phpki enqueued.  Job ID: 1941.

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
_______________________________________________
Mail for each SME Contribs bug report
To unsubscribe, e-mail [email protected]
Searchable archive at https://lists.contribs.org/mailman/public/contribteam/

Reply via email to