Sandro Bonazzola has uploaded a new change for review.
Change subject: packaging: dropping builddep on otopi-devtool
......................................................................
packaging: dropping builddep on otopi-devtool
We don't use otopi-bundle, so no reason for requiring it.
We can also avoid to require otopi at build time since it's
not used by the build process.
It's a runtime requirement only.
Change-Id: I0e3f21ad146c75cd2bc75f13a7bf49dcb35c6b3d
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M configure.ac
D m4/ax_python_module.m4
M ovirt-hosted-engine-setup.spec.in
3 files changed, 0 insertions(+), 55 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup
refs/changes/85/26585/1
diff --git a/configure.ac b/configure.ac
index 5e360a2..79df37e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,13 +58,8 @@
AC_CHECK_PROGS([PEP8], [pep8])
AC_ARG_VAR([RPMBUILD], [path to rpmbuild utility])
AC_CHECK_PROGS([RPMBUILD], [rpmbuild])
-AC_ARG_VAR([OTOPI_BUNDLE], [path to otopi-bundle utility])
-AC_PATH_PROGS([OTOPI_BUNDLE], [otopi-bundle],, [/usr/share/otopi])
AM_PATH_PYTHON([2.6],, [AC_MSG_ERROR([Cannot find python])])
-AX_PYTHON_MODULE([otopi], [fatal])
-
-test -z "${OTOPI_BUNDLE}" && AC_MSG_ERROR([otopi-bundle required but missing])
otopiplugindir="\$(datadir)/otopi/plugins"
ovirthostedengineplugindir="\$(pkgdatadir)/plugins"
diff --git a/m4/ax_python_module.m4 b/m4/ax_python_module.m4
deleted file mode 100644
index 8c2fbc3..0000000
--- a/m4/ax_python_module.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_python_module.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_PYTHON_MODULE(modname[, fatal])
-#
-# DESCRIPTION
-#
-# Checks for Python module.
-#
-# If fatal is non-empty then absence of a module will trigger an error.
-#
-# LICENSE
-#
-# Copyright (c) 2008 Andrew Collier <colli...@ukzn.ac.za>
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice
-# and this notice are preserved. This file is offered as-is, without any
-# warranty.
-
-#serial 5
-
-AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE])
-AC_DEFUN([AX_PYTHON_MODULE],[
- if test -z $PYTHON;
- then
- PYTHON="python"
- fi
- PYTHON_NAME=`basename $PYTHON`
- AC_MSG_CHECKING($PYTHON_NAME module: $1)
- $PYTHON -c "import $1" 2>/dev/null
- if test $? -eq 0;
- then
- AC_MSG_RESULT(yes)
- eval AS_TR_SH(HAVE_PYMOD_$1)=yes
- else
- AC_MSG_RESULT(no)
- eval AS_TR_SH(HAVE_PYMOD_$1)=no
- #
- if test -n "$2"
- then
- AC_MSG_ERROR(failed to find required module $1)
- exit 1
- fi
- fi
-])
diff --git a/ovirt-hosted-engine-setup.spec.in
b/ovirt-hosted-engine-setup.spec.in
index 983fd47..b7da337 100644
--- a/ovirt-hosted-engine-setup.spec.in
+++ b/ovirt-hosted-engine-setup.spec.in
@@ -55,7 +55,6 @@
Requires: lsof
Requires: iptables
BuildRequires: gettext
-BuildRequires: otopi-devtools >= 1.2.0
BuildRequires: python2-devel
Requires: %{engine}-sdk-python >= 3.4.0.6
--
To view, visit http://gerrit.ovirt.org/26585
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e3f21ad146c75cd2bc75f13a7bf49dcb35c6b3d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-hosted-engine-setup
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
