Minimum libvirt-gconfig and libosinfo versions appear in both README and configure.ac, which means they easily get out of sync. This commit renames README to README.in so that we can substitute the configure.ac version in the README file. This way they are always in sync. --- Makefile.am | 1 + README => README.in | 4 ++-- autogen.sh | 4 ++++ configure.ac | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) rename README => README.in (93%) diff --git a/Makefile.am b/Makefile.am index b928f83..9ef319a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,7 @@ EXTRA_DIST = \ $(PACKAGE).spec \ $(pkgconfig_DATA:%.pc=%.pc.in) \ AUTHORS.in \ + README.in \ $(NULL) DISTCLEAN_FILES = $(PACKAGE).spec $(pkgconfig_DATA) diff --git a/README b/README.in similarity index 93% rename from README rename to README.in index b7ca356..2fd8090 100644 --- a/README +++ b/README.in @@ -27,8 +27,8 @@ Or to install into a private user specific location The following mandatory dependencies are required in order to build libvirt-designer - libvirt-gconfig >= 0.1.3 (part of libvirt-glib project releases) - libosinfo >= 0.0.5 + libvirt-gconfig >= @LIBVIRT_GCONFIG_REQUIRED@ (part of libvirt-glib project releases) + libosinfo >= @LIBOSINFO_REQUIRED@ Communication diff --git a/autogen.sh b/autogen.sh index 9a0c976..72ce2c0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -41,6 +41,10 @@ fi # exists at all times :-( touch ChangeLog AUTHORS +# README is auto-generated from README.in at configure time, +# but automake requires that it exists at autogen.sh time +touch README + mkdir -p build-aux libtoolize --copy --force aclocal -I m4 diff --git a/configure.ac b/configure.ac index 89128d3..7167cd1 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,10 @@ LIBVIRT_GCONFIG_REQUIRED=0.1.7 LIBVIRT_GOBJECT_REQUIRED=0.1.3 GOBJECT_INTROSPECTION_REQUIRED=0.10.8 +# for proper substitution in README.in +AC_SUBST(LIBOSINFO_REQUIRED) +AC_SUBST(LIBVIRT_GCONFIG_REQUIRED) + LIBVIRT_DESIGNER_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'` LIBVIRT_DESIGNER_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'` LIBVIRT_DESIGNER_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'` @@ -145,6 +149,7 @@ fi AM_CONDITIONAL([WITH_VALA], [test "x$enable_vala" = "xyes"]) AC_OUTPUT(Makefile + README libvirt-designer/Makefile libvirt-designer.spec libvirt-designer-1.0.pc -- 1.8.1.4

Minimum libvirt-gobject, libvirt-gconfig and libosinfo versions are set in configure.ac, it's better not to duplicate them in libvirt-designer.spec.in, it's too easy to get them out of sync. --- configure.ac | 2 +- libvirt-designer.spec.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 7167cd1..ebb29e7 100644 --- a/configure.ac +++ b/configure.ac @@ -15,9 +15,9 @@ LIBVIRT_GCONFIG_REQUIRED=0.1.7 LIBVIRT_GOBJECT_REQUIRED=0.1.3 GOBJECT_INTROSPECTION_REQUIRED=0.10.8 -# for proper substitution in README.in AC_SUBST(LIBOSINFO_REQUIRED) AC_SUBST(LIBVIRT_GCONFIG_REQUIRED) +AC_SUBST(LIBVIRT_GOBJECT_REQUIRED) LIBVIRT_DESIGNER_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'` LIBVIRT_DESIGNER_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'` diff --git a/libvirt-designer.spec.in b/libvirt-designer.spec.in index d8145b4..894bcb8 100644 --- a/libvirt-designer.spec.in +++ b/libvirt-designer.spec.in @@ -20,12 +20,12 @@ License: LGPLv2+ URL: http://libvirt.org/ Source0: http://libvirt.org/sources/designer/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libvirt-gconfig-devel >= 0.0.9 -BuildRequires: libvirt-gobject-devel >= 0.1.3 +BuildRequires: libvirt-gconfig-devel >= @LIBVIRT_GCONFIG_REQUIRED@ +BuildRequires: libvirt-gobject-devel >= @LIBVIRT_GOBJECT_REQUIRED@ %if %{with_introspection} BuildRequires: gobject-introspection-devel %endif -BuildRequires: libosinfo-devel >= 0.0.5 +BuildRequires: libosinfo-devel >= @LIBOSINFO_REQUIRED@ %package libs Group: Development/Libraries @@ -35,7 +35,7 @@ Summary: Libvirt configuration designer libraries Group: Development/Libraries Summary: Libvirt configuration designer development headers Requires: %{name}-libs = %{version}-%{release} -Requires: libvirt-gconfig-devel >= 0.0.9 +Requires: libvirt-gconfig-devel >= @LIBVIRT_GCONFIG_REQUIRED@ %description This package provides the libvirt configuration designer command -- 1.8.1.4

On Mon, Apr 22, 2013 at 06:57:10PM +0200, Christophe Fergeau wrote:

--- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README index ed39b9d..b7ca356 100644 --- a/README +++ b/README @@ -24,7 +24,7 @@ Or to install into a private user specific location make make install

-The following mandatory dependancies are required in order to +The following mandatory dependencies are required in order to build libvirt-designer

libvirt-gconfig >= 0.1.3 (part of libvirt-glib project releases)

Speling eror fixes can be pushed under the trivial rule :-) ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|