Christoph Maser wrote:
Am Mittwoch, den 06.05.2009, 20:01 +0200 schrieb Greg Bailey:
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.
Ok now you talk about EL5? Since 1.6 on EL4 seems like not really worth
looking at unless someone has python24:
DEBUG: [...python build errors...]
But also subversion 1.5 for EL4 is a problem:
[...neon build errors...]
So looks like neon from EL4 is not suitable to compile this one.
Chris
Regarding Subversion 1.6.2 on CentOS 4:
Extending the idea of embedding required dependencies in the subversion
source tree, I'm able to build Subversion 1.6.2 on CentOS 4 that doesn't
require any external development RPMs to be installed first, and doesn't
require the user to upgrade apr, neon, sqlite, etc. The only ugly part
is that I included python 2.4.6 in the source RPM, and it is built
before the rest of subversion (but only affects the source RPM).
I've made test RPMs available at:
http://lxpro.com/subversion/el4/RPMS/
I'm attaching the patch to the subversion .spec file below.
thanks,
Greg
--- subversion-1.6.r6791.spec 2009-05-11 09:31:54.000000000 -0700
+++ subversion-1.6.2-1.el4.spec 2009-05-11 23:27:32.000000000 -0700
@@ -30,7 +30,7 @@
Name: subversion
Version: 1.6.2
### FC3 comes with release 1.1
-Release: 1
+Release: 1.el4
License: BSD
Group: Development/Tools
URL: http://subversion.tigris.org/
@@ -40,6 +40,8 @@
Source2: http://sqlite.org/sqlite-amalgamation-%{sqlite_version}.tar.gz
Source3: filter-requires.sh
Source4: http://www.xsteve.at/prg/emacs/psvn.el
+Source5: http://www.python.org/ftp/python/2.4.6/Python-2.4.6.tar.bz2
+Source6: http://www.webdav.org/neon/neon-0.28.4.tar.gz
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
@@ -52,7 +54,7 @@
BuildRequires: db4-devel >= 4.1.25, expat-devel, docbook-style-xsl, gettext
BuildRequires: apr-util-devel >= 0.9.3-2, openssl-devel
BuildRequires: apr-devel >= 0.9.4
-BuildRequires: neon-devel >= 0.24.7-1
+BuildConflicts: neon-devel
#%{!?_without_swig:BuildRequires: swig >= 1.3.21-5}
#%{!?_without_swig:BuildRequires: swig}
@@ -123,7 +125,7 @@
This package includes the Ruby bindings to the Subversion libraries.
%prep
-%setup -a 10 -a 2
+%setup -a 10 -a 2 -a 5 -a 6
%patch2 -p1 -b .deplibs
%patch3 -p1 -b .rpath
%{!?_without_pie:%patch6 -p1 -b .pie}
@@ -131,12 +133,19 @@
%{__rm} -rf neon apr apr-util
%{__mv} sqlite-3.6.13 sqlite-amalgamation
+%{__mv} neon-0.28.4 neon
echo _without_swig: %_without_swig
echo _without_pie: %_without_pie
echo dtag: %dtag
%build
+pushd Python-2.4.6
+./configure
+make
+export PYTHON=${PWD}/python
+popd
+
%if %{!?_without_swig:1}0
cd swig-%{swig_version}
[ ! -r configure ] && ./autogen.sh
@@ -151,6 +160,12 @@
# requirement for apr 0.9.7 seems to be bogus
%{__perl} -pi.orig -e 's|\.\[7-9\]|\.\[4-9\]|' configure
+# fix check for httpd version
+%{__perl} -pi.versioncheck -e 's|apache_minor_version=AP_SERVER_MINORVERSION_NUMBER|apache_minor_version=0|' configure
+
+# don't install neon header files or static libraries
+%{__perl} -pi.disableneoninstall -e 's|^install: external-install|install:|' Makefile.in
+
# fix shebang lines, #111498
%{__perl} -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
@@ -168,7 +183,6 @@
--with-apr-util="%{_prefix}" \
--with-apxs="%{_sbindir}/apxs" \
--with-expat \
- --with-neon="%{_prefix}" \
--with-ruby-sitedir="%{ruby_sitearch}" \
--with-sasl="%{_prefix}" \
--with-ssl \
@@ -321,6 +335,12 @@
%endif
%changelog
+* Mon May 11 2009 Greg Bailey <[email protected]> - 1.6.2-1.el4
+- Rebuilt for CentOS 4
+- Include python 2.4.6 (needed for build only)
+- Include neon 0.28.4 but don't install header files or static libraries
+- Fix httpd version check
+
* Mon May 11 2009 Christoph Maser <[email protected]> - 1.6.2-1
- Add sqlite3-amalgamation
- Add new .rpath .pie patches from fedora cvs
_______________________________________________
users mailing list
[email protected]
http://lists.rpmforge.net/mailman/listinfo/users
