Christoph Maser wrote:
Am Montag, den 20.04.2009, 14:28 +0200 schrieb Greg Bailey:
My understanding is that if the source for these 3rd party dependencies
is in the subversion source tree, then those versions are statically
built into the subversion binaries. Some test builds I did (using
pieces of the subversion-deps-1.6.1 download but not all), didn't have
external dependencies on sqlite and I was able to leave the system
sqlite RPM in place.
-Greg
Well it seems it works not this way. Instead the dependencies are
installed by the subversion install sequence, wich of course is totally
useless.
I don't see any solution worth the effort. After all our subversion
version for el5 is ahead of the fedora 10 version and light years from
what RHEL ships.
Chris
That's correct; I should have been more clear in my original e-mail.
I took the subversion 1.5.6-0.2.rf source RPM and patched the specfile
to pull in sqlite 3.6.13. (I could have also just used
sqlite-amalgamation from subversion-deps-1.6.1.tar.bz2). I had to
remove the patches for pie and rpath, presumably due to some change in
subversion 1.6.1 vs. 1.5.2. My patch for the specfile appears below.
I was also able to build subversion 1.6.1 by starting with Fedora 11's
development src RPM and including sqlite-amalgamation and a few other
minor modifications, like not being so specific on the required apr and
apr-util versions. The Fedora 11 SRPM has the pie and rpath patches
still applied and builds, so perhaps that could be used as a reference.
Another potential source for subversion 1.6.1 RPMs (for comparison
purposes) is at:
http://summersoft.fay.ar.us/pub/subversion/1.6.1/
but those RPMs upgrade core RPMs like sqlite, which I'm able to avoid
doing (at least on RHEL5) by using sqlite-amalgamation in the subversion
build.
My patch to the rpmforge spec looks like:
--- subversion.spec.bak 2009-03-18 19:21:24.000000000 -0700
+++ subversion.spec 2009-05-06 10:25:58.000000000 -0700
@@ -27,7 +27,7 @@
Summary: Modern Version Control System designed to replace CVS
Name: subversion
-Version: 1.5.6
+Version: 1.6.1
### FC3 comes with release 1.1
Release: 0.2.rf
License: BSD
@@ -39,13 +39,14 @@
Source0:
http://subversion.tigris.org/tarballs/subversion-%{version}.tar.bz2
Source1: subversion.conf
+Source2: http://sqlite.org/sqlite-amalgamation-3.6.13.tar.gz
Source3: filter-requires.sh
Source4: http://www.xsteve.at/prg/emacs/psvn.el
Source10: http://dl.sf.net/swig/swig-%{swig_version}.tar.gz
#Patch1: subversion-0.24.2-swig.patch
Patch2: subversion-0.20.1-deplibs.patch
-Patch3: subversion-0.31.0-rpath.patch
-Patch6: subversion-1.5.0-pie.patch
+#Patch3: subversion-0.31.0-rpath.patch
+#Patch6: subversion-1.5.0-pie.patch
Patch7: subversion-1.1.3-java.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -127,12 +128,15 @@
%setup -a 10
#patch1 -p1 -b .swig
%patch2 -p1 -b .deplibs
-%patch3 -p1 -b .rpath
-%{!?_without_pie:%patch6 -p1 -b .pie}
+#%patch3 -p1 -b .rpath
+#%{!?_without_pie:%patch6 -p1 -b .pie}
%{?_with_java:%patch7 -p1 -b .java}
%{__rm} -rf neon apr apr-util
+%{__tar} zxvf %{SOURCE2}
+mv sqlite-3.6.13 sqlite-amalgamation
+
echo _without_swig: %_without_swig
echo _without_pie: %_without_pie
echo dtag: %dtag
@@ -322,6 +326,10 @@
%endif
%changelog
+* Wed May 6 2009 Greg Bailey <[email protected]> - 1.6.1-0.2.rf
+- Updated to release 1.6.1.
+- Include sqlite-amalgamation 3.6.13
+
* Wed Mar 18 2009 Christoph Maser <[email protected]> - 1.5.6-0.2 -
6739/cmr
- Updated to swig 1.3.38
- Added --mandir= to swig configure
thanks,
Greg
_______________________________________________
users mailing list
[email protected]
http://lists.rpmforge.net/mailman/listinfo/users
