From e9efe5677eb6154f5d92be6502f0a97c965c5270 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 9 May 2006 13:20:46 +0000 Subject: subversion: upgrade to 1.3.1, fix staging --- packages/subversion/files/apr-regex.patch | 19 +++++++++++++++++++ packages/subversion/subversion_1.2.0.bb | 22 ---------------------- packages/subversion/subversion_1.3.0.bb | 22 ---------------------- packages/subversion/subversion_1.3.1.bb | 26 ++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 44 deletions(-) create mode 100644 packages/subversion/files/apr-regex.patch delete mode 100644 packages/subversion/subversion_1.2.0.bb delete mode 100644 packages/subversion/subversion_1.3.0.bb create mode 100644 packages/subversion/subversion_1.3.1.bb (limited to 'packages/subversion') diff --git a/packages/subversion/files/apr-regex.patch b/packages/subversion/files/apr-regex.patch new file mode 100644 index 0000000000..4f1f50a7d5 --- /dev/null +++ b/packages/subversion/files/apr-regex.patch @@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- subversion-1.3.1/configure~apr-regex ++++ subversion-1.3.1/configure +@@ -2933,9 +2933,9 @@ + + + +-APR_VER_REGEX="0\.9\.[5-9]" ++APR_VER_REGEX="0\.9\.12" + APR_VER_REGEX_TOO="1\." +-APU_VER_REGEX="0\.9\.[5-9]" ++APU_VER_REGEX="0\.9\.12" + APU_VER_REGEX_TOO="1\." + + diff --git a/packages/subversion/subversion_1.2.0.bb b/packages/subversion/subversion_1.2.0.bb deleted file mode 100644 index e50833b536..0000000000 --- a/packages/subversion/subversion_1.2.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "The Subversion (svn) client" -SECTION = "console/network" -DEPENDS = "apr-util-0.9.7 neon-0.24.7" -MAINTAINER = "Mustafa Yuecel " -LICENSE = "Apache/BSD" -HOMEPAGE = "http://subversion.tigris.org" - -PR = "r1" - -SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ - file://disable-revision-install.patch;patch=1" - -EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \ - --without-berkeley-db --without-apxs --without-apache \ - --without-swig --with-apr=${STAGING_BINDIR} \ - --with-apr-util=${STAGING_BINDIR}" - -inherit autotools - -do_configure() { - oe_runconf -} diff --git a/packages/subversion/subversion_1.3.0.bb b/packages/subversion/subversion_1.3.0.bb deleted file mode 100644 index 1211bea2fc..0000000000 --- a/packages/subversion/subversion_1.3.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "The Subversion (svn) client" -SECTION = "console/network" -DEPENDS = "apr-util-0.9.7 neon-0.25.5" -MAINTAINER = "Mustafa Yuecel " -LICENSE = "Apache/BSD" -HOMEPAGE = "http://subversion.tigris.org" - -PR = "r0" - -SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ - file://disable-revision-install.patch;patch=1" - -EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \ - --without-berkeley-db --without-apxs --without-apache \ - --without-swig --with-apr=${STAGING_BINDIR} \ - --with-apr-util=${STAGING_BINDIR}" - -inherit autotools - -do_configure() { - oe_runconf -} diff --git a/packages/subversion/subversion_1.3.1.bb b/packages/subversion/subversion_1.3.1.bb new file mode 100644 index 0000000000..ac537cf310 --- /dev/null +++ b/packages/subversion/subversion_1.3.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "The Subversion (svn) client" +SECTION = "console/network" +DEPENDS = "apr-util-0.9.12 neon" +MAINTAINER = "Mustafa Yuecel " +LICENSE = "Apache/BSD" +HOMEPAGE = "http://subversion.tigris.org" +PR = "r1" + +SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ + file://disable-revision-install.patch;patch=1 \ + file://apr-regex.patch;patch=1" + +EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \ + --without-berkeley-db --without-apxs --without-apache \ + --without-swig --with-apr=${STAGING_BINDIR} \ + --with-apr-util=${STAGING_BINDIR}" + +inherit autotools + +do_configure() { + oe_runconf +} + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3