Hey Mark,
Thanks for taking a look at this.
Mark Goodwin <mgoodwin@xxxxxxxxxx> writes:
[...]
> This needed some fixes in the fedora.spec (see attached patch), before
> it would build correctly. Lukas has done a fine job getting the
> fedora spec into shape - it's pretty complex and just needs a few tweaks
> to finish it off.
Odd, built fine for me, but the additional patch helps, thanks!
[...]
> Then compared the resulting lists with a graphical diff (I used xxdiff).
> The script and two lists are attached: see compare-pcp-packaging.sh,
> makepkgs.all and fedora.all. There are quite a lot of differences and
> issues we need to work thru - I'll finish this off tomorrow but hopefully
> Lukas or someone can take it on over night and make some progress.
I've continued to tweak the fedora.spec file. It's getting closer. By
far the biggest portion was the change in man page locations (now
located in pcp-doc). I've made those switches. The other major
difference is where the various config files should be shipped (such as
pmieconf/ and pmlogconf/ files, that coincide with no split-pmdas).
Makepkgs ships them in the pmda-foo packages, and fedora ships them in
the base pcp package. Which do people think is correct?
I've attached the difference in the fedora.spec so far.
Cheers,
Lukas
1531a1532,1533
> rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/pmwebd.*
> rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/PMWEBAPI.*
1647a1650,1651
> ls -1 $RPM_BUILD_ROOT/%{_mandir}/man1 |\
> sed -e 's#^#'%{_mandir}'\/man1\/#' >base_man.list
1650,1653d1653
< ls -1 $RPM_BUILD_ROOT/%{_mandir}/man1 |\
< sed -e 's#^#'%{_mandir}'\/man1\/#' >>pcp-doc.list
< ls -1 $RPM_BUILD_ROOT/%{_mandir}/man5 |\
< sed -e 's#^#'%{_mandir}'\/man5\/#' >>pcp-doc.list
1669c1669
< sed -e 's#^#'%{_mandir}'\/man3\/#' | grep -v '3pm' >>pcp-doc.list
---
> sed -e 's#^#'%{_mandir}'\/man3\/#' | grep -E -v '3pm|PMWEBAPI' >devel.list
1917a1918
> %{_mandir}/man5/*
2013a2015,2016
> %{_mandir}/man1/pmwebd.1*
> %{_mandir}/man3/PMWEBAPI.3*
2048a2052
> %{_mandir}/man1/pmmgr.1*
2051a2056
> %{_mandir}/man1/sar2pcp.1*
2054a2060
> %{_mandir}/man1/iostat2pcp.1*
2057a2064
> %{_mandir}/man1/mrtg2pcp.1*
2060a2068
> %{_mandir}/man1/ganglia2pcp.1*
2063a2072
> %{_mandir}/man1/collectl2pcp.1*
2067a2077
> %{_mandir}/man1/pmdapapi.1*
2073a2084,2086
> %{_mandir}/man1/perfalloc.1*
> %{_mandir}/man1/pmdaperfevent.1*
> %{_mandir}/man5/perfevent.conf.5*
2079a2093
> %{_mandir}/man1/pmdaib.1*
|