From 2985f0acdb14ae431386d0466a5055f10c2d62af Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 15 Feb 2006 13:21:17 +0000 Subject: [PATCH] * configure.in libvirt.spec.in include/libvirt.h.in python/Makefile.am src/Makefile.am: fix rpm packaging problems whith head, more LIBVIR -> LIBVIRT changes. Daniel --- ChangeLog | 6 ++++++ configure.in | 32 ++++++++++++++++---------------- include/libvirt.h.in | 2 +- include/libvirt/libvirt.h.in | 2 +- libvirt.spec.in | 1 + python/Makefile.am | 4 ++-- src/Makefile.am | 2 +- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92ea720287..5a4c6e035b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Feb 15 08:20:23 EST 2006 Daniel Veillard + + * configure.in libvirt.spec.in include/libvirt.h.in python/Makefile.am + src/Makefile.am: fix rpm packaging problems whith head, more + LIBVIR -> LIBVIRT changes. + Tue Feb 14 15:29:01 EST 2006 Daniel Veillard * Makefile.am configure.in python/Makefile.am python/tests/Makefile.am diff --git a/configure.in b/configure.in index 6982849ef5..38162d2645 100644 --- a/configure.in +++ b/configure.in @@ -3,33 +3,33 @@ AC_INIT(src/libvirt.c) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -LIBVIR_MAJOR_VERSION=0 -LIBVIR_MINOR_VERSION=0 -LIBVIR_MICRO_VERSION=4 -LIBVIR_MICRO_VERSION_SUFFIX= -LIBVIR_VERSION=$LIBVIR_MAJOR_VERSION.$LIBVIR_MINOR_VERSION.$LIBVIR_MICRO_VERSION$LIBVIR_MICRO_VERSION_SUFFIX -LIBVIR_VERSION_INFO=`expr $LIBVIR_MAJOR_VERSION + $LIBVIR_MINOR_VERSION`:$LIBVIR_MICRO_VERSION:$LIBVIR_MINOR_VERSION +LIBVIRT_MAJOR_VERSION=0 +LIBVIRT_MINOR_VERSION=0 +LIBVIRT_MICRO_VERSION=4 +LIBVIRT_MICRO_VERSION_SUFFIX= +LIBVIRT_VERSION=$LIBVIRT_MAJOR_VERSION.$LIBVIRT_MINOR_VERSION.$LIBVIRT_MICRO_VERSION$LIBVIRT_MICRO_VERSION_SUFFIX +LIBVIRT_VERSION_INFO=`expr $LIBVIRT_MAJOR_VERSION + $LIBVIRT_MINOR_VERSION`:$LIBVIRT_MICRO_VERSION:$LIBVIRT_MINOR_VERSION -LIBVIR_VERSION_NUMBER=`expr $LIBVIR_MAJOR_VERSION \* 1000000 + $LIBVIR_MINOR_VERSION \* 1000 + $LIBVIR_MICRO_VERSION` +LIBVIRT_VERSION_NUMBER=`expr $LIBVIRT_MAJOR_VERSION \* 1000000 + $LIBVIRT_MINOR_VERSION \* 1000 + $LIBVIRT_MICRO_VERSION` if test -f CVS/Entries; then extra=`grep ChangeLog CVS/Entries | grep -v LIBVIR | sed -e s\%/ChangeLog/1\.%% -e s\%/.*$%%` echo extra=$extra if test "$extra" != "" then - LIBVIR_VERSION_EXTRA="-CVS$extra" + LIBVIRT_VERSION_EXTRA="-CVS$extra" fi fi -AC_SUBST(LIBVIR_MAJOR_VERSION) -AC_SUBST(LIBVIR_MINOR_VERSION) -AC_SUBST(LIBVIR_MICRO_VERSION) -AC_SUBST(LIBVIR_VERSION) -AC_SUBST(LIBVIR_VERSION_INFO) -AC_SUBST(LIBVIR_VERSION_NUMBER) -AC_SUBST(LIBVIR_VERSION_EXTRA) +AC_SUBST(LIBVIRT_MAJOR_VERSION) +AC_SUBST(LIBVIRT_MINOR_VERSION) +AC_SUBST(LIBVIRT_MICRO_VERSION) +AC_SUBST(LIBVIRT_VERSION) +AC_SUBST(LIBVIRT_VERSION_INFO) +AC_SUBST(LIBVIRT_VERSION_NUMBER) +AC_SUBST(LIBVIRT_VERSION_EXTRA) -VERSION=${LIBVIR_VERSION} +VERSION=${LIBVIRT_VERSION} AM_INIT_AUTOMAKE(libvirt, $VERSION) diff --git a/include/libvirt.h.in b/include/libvirt.h.in index a0000cc4e0..aa7e0221e2 100644 --- a/include/libvirt.h.in +++ b/include/libvirt.h.in @@ -167,7 +167,7 @@ typedef enum { * version * 1,000,000 + minor * 1000 + micro */ -#define LIBVIR_VERSION_NUMBER @LIBVIR_VERSION_NUMBER@ +#define LIBVIR_VERSION_NUMBER @LIBVIRT_VERSION_NUMBER@ int virGetVersion (unsigned long *libVer, const char *type, diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a0000cc4e0..aa7e0221e2 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -167,7 +167,7 @@ typedef enum { * version * 1,000,000 + minor * 1000 + micro */ -#define LIBVIR_VERSION_NUMBER @LIBVIR_VERSION_NUMBER@ +#define LIBVIR_VERSION_NUMBER @LIBVIRT_VERSION_NUMBER@ int virGetVersion (unsigned long *libVer, const char *type, diff --git a/libvirt.spec.in b/libvirt.spec.in index 1911aba157..64c330ebbe 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -86,6 +86,7 @@ rm -fr %{buildroot} %doc AUTHORS NEWS README COPYING.LIB %{_libdir}/python*/site-packages/libvirt.py* %{_libdir}/python*/site-packages/libvirtmod* +%doc python/tests/*.py %doc python/TODO %doc python/libvirtclass.txt diff --git a/python/Makefile.am b/python/Makefile.am index a31c17da6d..c57b9f7e68 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -1,6 +1,6 @@ # Makefile for libvirt python library -SUBRIRS= . tests +SUBDIRS= . tests INCLUDES = \ -I$(PYTHON_INCLUDES) \ @@ -8,7 +8,7 @@ INCLUDES = \ -I$(top_builddir)/include \ -I$(top_builddir)/$(subdir) -DOCS_DIR = $(datadir)/doc/libvirt-python-$(LIBVIR_VERSION) +DOCS_DIR = $(datadir)/doc/libvirt-python-$(LIBVIRT_VERSION) DOCS = ${srcdir}/TODO diff --git a/src/Makefile.am b/src/Makefile.am index 534d77b790..7caad2da20 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,7 @@ EXTRA_DIST = libvirt_sym.version lib_LTLIBRARIES = libvirt.la libvirt_la_LIBADD = libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \ - -version-info @LIBVIR_VERSION_INFO@ + -version-info @LIBVIRT_VERSION_INFO@ libvirt_la_SOURCES = \ libvirt.c internal.h \ hash.c hash.h \ -- GitLab