Bug 176725
|
Description
Tim Jackson
2005-12-30 23:57:05 UTC
Created attachment 122652 [details]
Patch for the spec file incorporating makerpm fixes
Created attachment 122653 [details] Rollup fixes to template for RH naming convs and PEAR bug 6047 Created attachment 122654 [details] Fix for PEAR bug 5373 (RPMs can't be uninstalled) Created attachment 122655 [details] Additional functionality for makerpm that enables easier distro-specific naming conventions (PEAR bug 6375) Created attachment 122656 [details]
Patch for RH/Fedora naming conventions. Also includes patch to generate deps on php-[ext]
Tim; these patches don't seem to actually apply if I upgared to 1.4.6, they really are for 1.4.5? Have you got rediffed versions vs 1.4.6 handy? + /usr/bin/patch -p0 data/PEAR/template.spec /local/build/SOURCES/php-pear-1.4.5-template-fixes.patch patching file data/PEAR/template.spec Hunk #2 FAILED at 10. Hunk #3 FAILED at 18. Hunk #4 FAILED at 52. 3 out of 4 hunks FAILED -- saving rejects to file data/PEAR/template.spec.rej Hmm, the 1.4.6 template.spec has changed so I'm not entirely surprised they don't apply. I'll do a new set shortly. Created attachment 123160 [details] Patch to put PEAR stuff in the right place New patch for 1.4.6 eliminates most of the fixes as they have already been done upstream. Also makes the detection of PEAR installation generic rather than FC/RH-specific (as suggested in bug #176733) which means these changes can be pushed upstream in future (I will do). The rest of the patches (template-postun, makerpm-cleanup and
makerpm-rh-namingconvs) are still needed but all apply fine to PEAR 1.4.6. Need
to be applied in the above order, though, and after the
php-pear-1.4.6-template-fixes.patch (attachment #123160 [details]) that I just uploaded.
OK, this should all be fixed in 1.4.6-1; please let me know if I've missed anything, Tim. Looks great Joe - thanks - *except* that there is the huge problem of bug #173804 - this *really* needs fixing or it will block any attempts either here or upstream to be able to meaningfully build php-pear RPM packages. e.g. if I build PHPUnit2 with "pear makerpm" from your 1.4.6 packages, it's all cool except when I install it: # rpm -ivh ../RPMS/noarch/php-pear-PHPUnit2-2.3.3-1.noarch.rpm error: Failed dependencies: php-dom is needed by php-pear-PHPUnit2-2.3.3-1.noarch php-spl is needed by php-pear-PHPUnit2-2.3.3-1.noarch Now, in fact these deps (in Fedora) - well, the php-spl one at least - are provided by the Core php package, but it just doesn't declare them. |