get ready for 1.2

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@340 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/00README b/00README
index 7c5753b..5f197b3 100644 (file)
--- a/00README
+++ b/00README
@@ -1,6 +1,6 @@
 Title: RRDtool
 Title: RRDtool

-Date: 2000-01-10
-Owner: Tobias Oetiker <oetiker@ee.ethz.ch>
+Date: 2005-04-04
+Owner: Tobias Oetiker <tobi@oetiker.ch>

 Group: Software
 
 Round Robin Database Tool
 Group: Software
 
 Round Robin Database Tool

diff --git a/COPYRIGHT b/COPYRIGHT
index 89f1289..84e2a95 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -2,7 +2,7 @@
  A tool for fast logging of numerical data graphical display
  of this data.
 
  A tool for fast logging of numerical data graphical display
  of this data.
 

- Copyright (c) 1998, 1999 Tobias Oetiker
+ Copyright (c) 1998-2005 Tobias Oetiker

  All rights reserved.
 
  This program is free software; you can redistribute it and/or modify it
  All rights reserved.
 
  This program is free software; you can redistribute it and/or modify it

diff --git a/NEWS b/NEWS
index 9d461b4..2d2e70b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,11 @@ RRDTOOL NEWS
 
 
 In this file I am noting the major changes to RRDtool
 
 
 In this file I am noting the major changes to RRDtool

-for details check the cvs ChangeLog
+for details check the svn ChangeLog
+
+2005/04/04 Tobi Oetiker <tobi@oetiker.ch>
+  After adding lots of patches and doing a
+  autotools update we are ready for 1.2rc1

 
 2004/01/20 Tobi Oetiker <tobi@oetiker.ch>
   Ripped out all foreign libraries and adapted
 
 2004/01/20 Tobi Oetiker <tobi@oetiker.ch>
   Ripped out all foreign libraries and adapted

diff --git a/PROJECTS b/PROJECTS
index dbba94b..bccea05 100644 (file)
--- a/PROJECTS
+++ b/PROJECTS
@@ -6,9 +6,6 @@ Interested:
 Tobias Oetiker <oetiker@ee.ethz.ch>
 Jake Brutlag <jakeb@microsoft.com>  
 - updating rrd_update to use accessor fks
 Tobias Oetiker <oetiker@ee.ethz.ch>
 Jake Brutlag <jakeb@microsoft.com>  
 - updating rrd_update to use accessor fks

-Karl Schilke <karl_schilke@eli.net> 
-- changeing data access to mmap
-

 
 Plan:
 
 
 Plan:
 

diff --git a/README b/README
index d28600c..02e9c21 100644 (file)
--- a/README
+++ b/README
@@ -137,7 +137,7 @@ Use GNU   diff --unified --recursive olddir newdir   to build your patches.
 
 The latest Version:
 -------------------
 
 The latest Version:
 -------------------

-Is available from http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
+Is available from http://people.ee.ethz.ch/oetiker/webtools/rrdtool/

 
 
 Tobias Oetiker <oetiker@ee.ethz.ch>
 
 
 Tobias Oetiker <oetiker@ee.ethz.ch>

diff --git a/TODO b/TODO
index 350f2b8..1ca501c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,12 +1,5 @@
 What has to be done before the 1.2.0 Release
 --------------------------------------------
 What has to be done before the 1.2.0 Release
 --------------------------------------------

-* Add tab support so that it becomes possible to use proportional
-  fonts in the legend
-
-* Polish up the looks of the generated graphs.
-
-* Remove all unfinished code like the PIE chart stuff.
-

 * Sync Docs with reality (there are things described which have not been
   implemented)
 
 * Sync Docs with reality (there are things described which have not been
   implemented)
 


@@ -37,7 +30,7 @@ Let the user define the base resolution of the graph independently of
 the pixel resolution. If it is smaller than one pixel it will simply
 be ignored
 
 the pixel resolution. If it is smaller than one pixel it will simply
 be ignored
 

-allow sub second presition for step definition
+allow sub second precision for the step definition

 
 modularise consolidation and acquisition functions
 
 
 modularise consolidation and acquisition functions
 


@@ -75,4 +68,3 @@ have configurable role-over limits for counters
 align data points not to GMT but some free offset
 
 allow starting through symlinks called rrdcreate rrdtune and the like
 align data points not to GMT but some free offset
 
 allow starting through symlinks called rrdcreate rrdtune and the like

-

diff --git a/acinclude.m4 b/acinclude.m4
index 062216a..ee6aca4 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,8 +9,8 @@ dnl if this check fails set the environment variable EX_CHECK_ALL_ERR to YES
 dnl and prints out a helful message
 dnl
 dnl
 dnl and prints out a helful message
 dnl
 dnl

-dnl EX_CHECK_ALL(library, function, header, pkgconf name, tested-version, homepage)
-dnl              $1       $2        $3      $4            $5              $6
+dnl EX_CHECK_ALL(library, function, header, pkgconf name, tested-version, homepage, cppflags)
+dnl              $1       $2        $3      $4            $5              $6        $7

 dnl
 dnl
 AC_DEFUN([EX_CHECK_ALL],
 dnl
 dnl
 AC_DEFUN([EX_CHECK_ALL],


@@ -20,6 +20,9 @@ AC_DEFUN([EX_CHECK_ALL],
  ex_check_save_LIBS=${LIBS}
  ex_check_save_CPPFLAGS=${CPPFLAGS}
  ex_check_save_LDFLAGS=${LDPFLAGS}
  ex_check_save_LIBS=${LIBS}
  ex_check_save_CPPFLAGS=${CPPFLAGS}
  ex_check_save_LDFLAGS=${LDPFLAGS}

+ if [ x$7 != x ]; then
+   CPPFLAGS="-I$7 $CPPFLAGS"
+ fi

  dnl try compiling naked first
  AC_CHECK_LIB($1,$2, [
     AC_CHECK_HEADER($3,[LIBS="-l$1 ${LIBS}";EX_CHECK_STATE=YES],[])],[])
  dnl try compiling naked first
  AC_CHECK_LIB($1,$2, [
     AC_CHECK_HEADER($3,[LIBS="-l$1 ${LIBS}";EX_CHECK_STATE=YES],[])],[])


@@ -77,6 +80,7 @@ AC_DEFUN([EX_CHECK_ALL],
     AC_LANG_POP(C)
 ]
 )
     AC_LANG_POP(C)
 ]
 )

+

 dnl
 dnl  Ptherad check from http://autoconf-archive.cryp.to/acx_pthread.m4
 dnl
 dnl
 dnl  Ptherad check from http://autoconf-archive.cryp.to/acx_pthread.m4
 dnl

diff --git a/configure.ac b/configure.ac
index 72c3a80..370dd5c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl
 dnl Inspiration from http://autoconf-archive.cryp.to
 
 dnl tell automake the this script is for rrdtool
 dnl Inspiration from http://autoconf-archive.cryp.to
 
 dnl tell automake the this script is for rrdtool

-AC_INIT([rrdtool],[1.1.9901])
+AC_INIT([rrdtool],[1.2rc1])

 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])


@@ -21,7 +21,11 @@ dnl determine the type of system we are running on
 AC_SUBST(VERSION)
 
 dnl where we install our stuff ...
 AC_SUBST(VERSION)
 
 dnl where we install our stuff ...

-AC_PREFIX_DEFAULT( /usr/local/rrdtool-$PACKAGE_VERSION )
+if [ -d /opt ]; then
+   AC_PREFIX_DEFAULT( /opt/rrdtool-$PACKAGE_VERSION )
+else
+   AC_PREFIX_DEFAULT( /usr/local/rrdtool-$PACKAGE_VERSION )
+fi

 
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)
 
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)


@@ -208,14 +212,14 @@ AC_DEFINE_UNQUOTED(RRDGRAPH_YLEGEND_ANGLE,${RRDGRAPH_YLEGEND_ANGLE:-90.0},
 AC_ARG_ENABLE(rrdcgi,[  --disable-rrdcgi        disable building of rrdcgi],
 [],[enable_rrdcgi=yes])
 AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])
 AC_ARG_ENABLE(rrdcgi,[  --disable-rrdcgi        disable building of rrdcgi],
 [],[enable_rrdcgi=yes])
 AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])

- 
+

 if test $enable_rrdcgi != no; then
 if test $enable_rrdcgi != no; then

-EX_CHECK_ALL(cgi,        cgiInit,                   cgi.h,                  cgilib,      0.5,    http://www.infodrom.org/projects/cgilib)
+EX_CHECK_ALL(cgi,        cgiInit,                   cgi.h,                  cgilib,      0.5,    http://www.infodrom.org/projects/cgilib, "")

 fi
 fi

-EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point,       libart_lgpl/libart.h,   libart-2.0,  2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/)
-EX_CHECK_ALL(z,          zlibVersion,               zlib.h,                 zlib,        1.2.1,  http://www.gzip.org/zlib/)
-EX_CHECK_ALL(png,        png_access_version_number, png.h,                  libpng,      1.2.8,  http://prdownloads.sourceforge.net/libpng/)
-EX_CHECK_ALL(freetype,   FT_Init_FreeType,          ft2build.h,                     freetype2,   2.1.9,  http://prdownloads.sourceforge.net/freetype/)
+EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point,       libart_lgpl/libart.h,   libart-2.0,  2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, /usr/include/libart-2.0)
+EX_CHECK_ALL(z,          zlibVersion,               zlib.h,                 zlib,        1.2.1,  http://www.gzip.org/zlib/, "")
+EX_CHECK_ALL(png,        png_access_version_number, png.h,                  libpng,      1.2.8,  http://prdownloads.sourceforge.net/libpng/, "")
+EX_CHECK_ALL(freetype,   FT_Init_FreeType,          ft2build.h,                     freetype2,   2.1.9,  http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2)

 
 if test "$EX_CHECK_ALL_ERR" = "YES"; then
   AC_MSG_ERROR([Please fix the library issues listed above and try again.])
 
 if test "$EX_CHECK_ALL_ERR" = "YES"; then
   AC_MSG_ERROR([Please fix the library issues listed above and try again.])

diff --git a/rrdtool.spec b/rrdtool.spec
index 738ce40..deeddc2 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -4,11 +4,11 @@
 
 Summary: Round Robin Database Tools
 Name: rrdtool
 
 Summary: Round Robin Database Tools
 Name: rrdtool

-Version: 1.1.0
+Version: 1.2rc1

 Release: %{cvsver}
 License: GPL
 Group: Applications/Databases
 Release: %{cvsver}
 License: GPL
 Group: Applications/Databases

-Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/beta/rrdtool-cvs-snap.tar.gz
+Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/beta/rrdtool-1.2rc1.tar.gz

 URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
 Buildroot: /tmp/%{name}-root
 
 URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
 Buildroot: /tmp/%{name}-root