repoforge/rpms — pull request #137 by kevbo-oh (2012-03-30 14:35:49+00:00)
Title: Fix 1.7.4 build in mock, pull in more from Fedora 17

I've done a lot of work on the subversion spec. I really dove into what Fedora is currently doing, and folded a large amount of changes in. Our current .spec didn't do all the things that CentOS 6.x's does, so I included everything that makes sense to include. I have a couple of questions/comments/thoughts.

0) My original spec didn't build under mock, which is why I suspect it hasn't shown up in the repo yet. This one does. I changed the revision to .2, since .1 is out there in git...but it never actually built. So, should this be .2, or .1?

1) Fedora now packages with a bit more granularity. There is a -libs and a -python, for the python binding. CentOS 6 has both of those things in the main package. I kept in the CentOS way, so that if we replace packages, we'll basically put the same things in. I can change it to the Fedora way if so desired.

2) Fedora adds a -tools package and moves some of the stuff in the tools directory to its own package:
# Install tools ex diff*
make install-tools DESTDIR=$RPM_BUILD_ROOT toolsdir=%{_bindir}
rm -f $RPM_BUILD_ROOT%{_bindir}/diff*

for f in svn-populate-node-origins-index svn-rep-sharing-stats svnauthz-validate svnmucc svnraisetreeconflict; do
echo %{_bindir}/$f
done | tee tools.files | sed 's/^/%%exclude /' > exclude.tools.files

My spec doesn't do this, as CentOS doesn't. It leaves these tools in the main subversion package.

3) There was a line in the rpm that turned the exec bit off on some included tools and scripts. I'm not sure why. CentOS doesn't do that, so I disabled it.

4) For building kwallet, there's a dependency:
BuildRequires: kdelibs-devel >= 4.0.0
For some reason, this brought in kdelibs3-devel, not kdelibs4-devel. yum-builddep appears to be the piece that's pulling in the wrong one from the .spec file. So, I changed the requirement to:
BuildRequires: kdelibs4-devel >= 4.0.0