vici: Replace dr with dev in version numbers for the Python egg

The versioning scheme used by Python (PEP 440) supports the rcN suffix
but development releases have to be named devN, not drN, which are
not supported and considered legacy versions.

diff --git a/configure.ac b/configure.ac
index 1c2bdae553938e323b40100272bc9861eb7673e1..4608ce8f7d786e907002c86b56487814f01ab9b4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1244,6 +1244,8 @@ fi
 AM_CONDITIONAL(RUBY_GEMS_INSTALL, [test "x$ruby_gems_install" = xtrue])
 
 if test x$python_eggs = xtrue; then
+       PYTHON_PACKAGE_VERSION=`echo "$PACKAGE_VERSION" | $SED 's/dr/dev/'`
+       AC_SUBST([PYTHON_PACKAGE_VERSION])
        if test x$python_eggs_install = xtrue; then
                AC_PATH_PROG([EASY_INSTALL], [easy_install], [], [$PATH:/bin:/usr/bin:/usr/local/bin])
                if test x$EASY_INSTALL = x; then

diff --git a/src/libcharon/plugins/vici/python/Makefile.am b/src/libcharon/plugins/vici/python/Makefile.am
index 5936f2a5e906add740b344d49bc3f99b23a525a9..20d44b5b2b8efff824b4135108291697be900dcb 100644 (file)
--- a/src/libcharon/plugins/vici/python/Makefile.am
+++ b/src/libcharon/plugins/vici/python/Makefile.am
@@ -10,12 +10,12 @@ EXTRA_DIST = LICENSE MANIFEST.in \
 
 $(srcdir)/setup.py: $(srcdir)/setup.py.in
        $(AM_V_GEN) sed \
-       -e "s:@EGG_VERSION@:$(PACKAGE_VERSION):" \
+       -e "s:@EGG_VERSION@:$(PYTHON_PACKAGE_VERSION):" \
        $(srcdir)/setup.py.in > $@
 
-all-local: dist/vici-$(PACKAGE_VERSION)-py$(PYTHON_VERSION).egg
+all-local: dist/vici-$(PYTHON_PACKAGE_VERSION)-py$(PYTHON_VERSION).egg
 
-dist/vici-$(PACKAGE_VERSION)-py$(PYTHON_VERSION).egg: $(EXTRA_DIST) $(srcdir)/setup.py
+dist/vici-$(PYTHON_PACKAGE_VERSION)-py$(PYTHON_VERSION).egg: $(EXTRA_DIST) $(srcdir)/setup.py
        (cd $(srcdir); $(PYTHON) setup.py bdist_egg \
                -b $(shell readlink -f $(builddir))/build \
                -d $(shell readlink -f $(builddir))/dist)
@@ -25,9 +25,9 @@ clean-local:
        rm -rf $(srcdir)/setup.py $(srcdir)/vici.egg-info $(builddir)/dist
 
 if PYTHON_EGGS_INSTALL
-install-exec-local: dist/vici-$(PACKAGE_VERSION)-py$(PYTHON_VERSION).egg
+install-exec-local: dist/vici-$(PYTHON_PACKAGE_VERSION)-py$(PYTHON_VERSION).egg
        $(EASY_INSTALL) $(PYTHONEGGINSTALLDIR) \
-               dist/vici-$(PACKAGE_VERSION)-py$(PYTHON_VERSION).egg
+               dist/vici-$(PYTHON_PACKAGE_VERSION)-py$(PYTHON_VERSION).egg
 endif
 
 if USE_PY_TEST