On Thu, 2007-11-08 at 18:48 -0800, Bernard Li wrote:

> Index: configure.in
> ===================================================================
> --- configure.in      (revision 861)
> +++ configure.in      (working copy)
> @@ -64,10 +64,14 @@
>  if test "$GANGLIA_SNAPSHOT" != yes;
>  then
>  
> GANGLIA_VERSION=$GANGLIA_MAJOR_VERSION.$GANGLIA_MINOR_VERSION.$GANGLIA_MICRO_VERSION
> +RPM_RELEASE=1
>  else
>  
> GANGLIA_VERSION=$GANGLIA_MAJOR_VERSION.$GANGLIA_MINOR_VERSION.$GANGLIA_MICRO_VERSION.$GANGLIA_SNAPSHOT_DATE
> +RPM_RELEASE=0.$GANGLIA_SNAPSHOT_DATE
>  fi
> 
> +RPM_VERSION=$GANGLIA_MAJOR_VERSION.$GANGLIA_MINOR_VERSION.$GANGLIA_MICRO_VERSION
> +
>  AM_INIT_AUTOMAKE(ganglia, $GANGLIA_VERSION)
> 
>  AC_SUBST(GANGLIA_MAJOR_VERSION)
> @@ -75,6 +79,8 @@
>  AC_SUBST(GANGLIA_MICRO_VERSION)
>  AC_SUBST(GANGLIA_VERSION)
>  AC_SUBST(GANGLIA_RELEASE_NAME)
> +AC_SUBST(RPM_VERSION)
> +AC_SUBST(RPM_RELEASE)
> 
>  AC_SUBST(LIBGANGLIA_INTERFACE_AGE)
>  AC_SUBST(LIBGANGLIA_BINARY_AGE)
> Index: ganglia.spec.in
> ===================================================================
> --- ganglia.spec.in   (revision 861)
> +++ ganglia.spec.in   (working copy)
> @@ -12,13 +12,13 @@
>  #
>  Summary: Ganglia Distributed Monitoring System
>  Name: @PACKAGE@
> -Version: @VERSION@
> +Version: @RPM_VERSION@
>  URL: http://ganglia.info/
> -Release: 1
> +Release: @RPM_RELEASE@
>  License: BSD
>  Vendor: Ganglia Development Team <ganglia-developers@lists.sourceforge.net>
>  Group: System Environment/Base
> -Source: %{name}-%{version}.tar.gz
> +Source: [EMAIL PROTECTED]@.tar.gz
>  Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
>  BuildRequires: libpng-devel, libart_lgpl-devel, gcc-c++,
> python-devel, libconfuse-devel
>  %if 0%{?suse_version}
> @@ -133,7 +133,7 @@
>  %endif
> 
>  %prep
> -%setup
> +%setup -n [EMAIL PROTECTED]@
> 
>  %build
>  %configure --with-gmetad --enable-python
> 
> What do you think?

I think that looks good.  I had actually debated whether the logic
should go in the spec file or configure.in.  I ended up modifying the
spec file because I was more familiar with it than with the autoconf
stuff, but your patch seems less "hackish" than mine.

-- 
Rick Mohr
Systems Developer
Ohio Supercomputer Center


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Ganglia-developers mailing list
Ganglia-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ganglia-developers

Reply via email to