Mailinglist Archive: opensuse-commit (861 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory
checked in at Wed Jan 12 08:43:40 CET 2011.



--------
--- rrdtool/rrdtool.changes     2010-12-07 09:49:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/rrdtool/rrdtool.changes        2010-12-28 
03:59:32.000000000 +0100
@@ -1,0 +2,35 @@
+Tue Dec 28 02:05:03 UTC 2010 - pascal.bleser@xxxxxxxxxxxx
+
+- build lua bindings (new subpackage lua-rrdtool)
+
+- update to 1.4.5:
+  * rrdcached: print \n at the end of log messages when running rrdcached in 
the foreground
+  * rrdcached: Let the -s, -m and -P options affect the default socket as well
+  * rrdgraph: font related memory leaks fixed #208
+  * rrdgraph-libdbi: print error message instead of dumping core on sql problem
+  * rrdgraph-libdbi: properly allocated response buffer
+  * rrdtool: in remote mode, make argument count for remote commmands strict
+  * rrdgraph: fix problems with second %s in right-axis format
+  * everywhere: fix locale handling. locales were not properly reset after 
calling set locale
+  * rrdgraph: fix use of %s in strftime (G)PRINT commands #277
+  * ruby: fix bindings to be compatible with curent ruby implementations #279
+  * rrdcached: Ensure that response_read() always calls fflush() or fclose() 
#278
+  * rrd_client: free addrinfo list after use ...
+  * rrdupdate: follow the normal code path for exiting rrd_update if there is 
a problem with rrdc, plugging a memory leak on the way
+  * rrdgraph: make sure we do not try to draw points all that far outside the 
drawing area since some versions of cairo seem to go unstable when this happens
+  * rrdgraph: fix an endles loop near 2^31 timestamp (32bit platform problem)
+  * rrdcached: fix permissions of the default socket
+  * rrdgraph-libdbi: Fix sigma calculation
+  * rrdcreate: better checks for RRA arguments
+  * rrdgraph: if there is no right label, do not reserve any space for it
+  * Enhancements:
+    + rrdcached: add hosts_access support
+    + rrdfetch/graph: introduce "epoch" as a new base time reference, meaning 
timestamp 0: you can now write epoch+11111111s or epoch+19711205s
+  * update in-tree cgilib to 0.7:
+    + allow cookies without regular CGI POST/GET variables
+    + support for ';' as delimiter
+    + support for multipart/form-data
+    + support for file upload
+    + decode variable names and data 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  cgilib-0.5.tar.bz2
  rrdtool-1.4.4.tar.bz2

New:
----
  cgilib-0.7.tar.bz2
  cgilib-fix_automake.patch
  rrdtool-1.4.5.tar.bz2
  rrdtool-lua_lib64.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rrdtool.spec ++++++
--- /var/tmp/diff_new_pack.FmoLaU/_old  2011-01-12 08:39:12.000000000 +0100
+++ /var/tmp/diff_new_pack.FmoLaU/_new  2011-01-12 08:39:12.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package rrdtool (Version 1.4.4)
+# spec file for package rrdtool (Version 1.4.5)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,16 +18,31 @@
 
 
 Name:           rrdtool
-BuildRequires:  cairo-devel freetype2-devel gettext-tools glib2-devel intltool 
libart_lgpl-devel libpng-devel libxml2-devel pango-devel python-devel tcl-devel
+BuildRequires:  cairo-devel freetype2-devel glib2-devel intltool 
libart_lgpl-devel libpng-devel libxml2-devel pango-devel python-devel tcl-devel
+%if 0%{?suse_version} >= 1100
+BuildRequires:  gettext-tools
+%else
+BuildRequires:  gettext
+%endif
 BuildRequires:  ruby-devel
+%if 0%{?suse_version} >= 920
+%define has_lua 1
+BuildRequires:  lua-devel
+%endif
+BuildRequires:  autoconf automake libtool
+BuildRequires:  tcpd-devel
 License:        GPLv2+
 Group:          Productivity/Scientific/Math
-AutoReqProv:    on
 Requires:       perl = %{perl_version}
-Version:        1.4.4
-Release:        2
+Version:        1.4.5
+Release:        1
+%define cgilib_version 0.7
+# http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
 Source:         %{name}-%{version}.tar.bz2
-Source1:        cgilib-0.5.tar.bz2 
+Patch1:         rrdtool-lua_lib64.patch
+# 
http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
+Source1:        cgilib-%{cgilib_version}.tar.bz2
+Patch11:        cgilib-fix_automake.patch
 Url:            http://oss.oetiker.ch/rrdtool/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A tool for data logging and analysis
@@ -41,27 +56,49 @@
 
 %prep
 %setup -q -a1
+%if %{_lib}==lib64
+%patch1
+%endif
+pushd "cgilib-%{cgilib_version}"
+%patch11
+popd #cgilib
 
 %build
 # first prepare cgilib
-cd cgilib*
-make CC=gcc CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -fexcess-precision=fast"
-mkdir -p ../lb/include
-cp *.h ../lb/include
-mkdir -p ../lb/lib
-cp libcgi* ../lb/lib
-cd ..
+pushd cgilib-%{cgilib_version}
+echo -n > NEWS
+aclocal --force
+autoreconf -fiv
+CGILIB_CFLAGS="%{optflags} -fPIC -I."
+%if 0%{?suse_version} >= 1130
+CGILIB_CFLAGS="$CGILIB_CFLAGS -fexcess-precision=fast"
+%endif
+CFLAGS="$CGILIB_CFLAGS" \
+%configure
+make %{?jobs:-j %jobs}
+%__mkdir_p ../lb/include
+%__cp *.h ../lb/include/
+%__mkdir_p ../lb/lib/
+%__cp -a .libs/libcgi.so* ../lb/lib/
+popd #cgilib
+
 # build rrdtool
 %{suse_update_config}
 if [ ! -d m4 ]; then mkdir m4; fi
 # we need getext 0.18
 #autoreconf -i -f
+%if %{_lib}==lib64
+# don't pass -i to autoreconf, that'll run autopoint which will go
+# nuts because of the supposedly outdated gettext version:
+autoreconf -fv
+%endif
 export LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \
 %configure --disable-static --with-pic --enable-shared \
             --with-tcllib=%{_libdir} \
             --with-gnu-ld \
+            --disable-rpath \
             --with-rrd-default-font="monospace" 
-make %{?jobs:-j %jobs}
+make %{?jobs:-j %jobs} V=1
 
 %install
 #eval `perl -V:installarchlib`
@@ -94,7 +131,7 @@
 #mv tmp $RPM_BUILD_ROOT/%{_libdir}/librrd.la
 #sed 
's/[[:space:]]*-L\/usr\/src\/packages\/BUILD\/%{name}-%{version}\/lb\/lib[[:space:]]*/
 /' $RPM_BUILD_ROOT/%{_libdir}/librrd_th.la > tmp
 #mv tmp $RPM_BUILD_ROOT/%{_libdir}/librrd_th.la
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+find "%{buildroot}" -type f -name '*.la' -exec %__rm {} \;
 # documentation
 install -m 644 CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO 
$RPM_BUILD_ROOT/%{_docdir}/%{name}
 # Script libraries for Tcl extensions should be in a package-specific
@@ -167,4 +204,28 @@
 %defattr(-, root, root)
 %{py_sitedir}/*
 
+%if 0%{?has_lua}
+
+%package -n lua-rrdtool
+License:        GPLv2+
+Summary:        Lua bindings for rrdtool
+Group:          Productivity/Scientific/Math
+Requires:       %name = %version
+
+%description -n lua-rrdtool
+A tool to log and analyze data gathered from all kinds of data sources.
+The data analysis part of RRDtool is based on the ability to quickly
+generate graphical representations of the data values collected over a
+definable time period.
+
+This package contains the Lua bindings
+
+%files -n lua-rrdtool
+%defattr(-, root, root)
+%dir %{_libdir}/lua
+%dir %{_libdir}/lua/*
+%{_libdir}/lua/*/rrd.so
+%{_libdir}/lua/*/rrd.so.*
+%endif
+
 %changelog

++++++ cgilib-0.5.tar.bz2 -> cgilib-0.7.tar.bz2 ++++++
++++ 36808 lines of diff (skipped)

++++++ cgilib-fix_automake.patch ++++++
--- configure.ac.orig   2010-12-28 03:10:53.000000000 +0100
+++ configure.ac        2010-12-28 03:15:03.000000000 +0100
@@ -1,11 +1,11 @@
-AC_INIT(cgi.c)
-
-AM_INIT_AUTOMAKE(cgilib, 0.7)
+AC_INIT(cgilib, 0.7)
+AC_CONFIG_SRCDIR([cgi.c])
+AM_INIT_AUTOMAKE
 SO_VERSION=1:0:0
 
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+AM_PROG_LIBTOOL
 
 AC_SUBST(SO_VERSION)
 
++++++ rrdtool-1.4.4.tar.bz2 -> rrdtool-1.4.5.tar.bz2 ++++++
++++ 3180 lines of diff (skipped)

++++++ rrdtool-lua_lib64.patch ++++++
--- configure.ac.orig   2010-12-28 03:34:15.000000000 +0100
+++ configure.ac        2010-12-28 03:34:27.000000000 +0100
@@ -783,7 +783,7 @@
           done
         fi
 
-        LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot"
+        LUA_RRD_LIBDIR="$langpref/lib64/lua/$lua_vdot"
         # if lua 5.0 can't find compat-5.1, force installation of
         # compat-5.1.lua together with RRDtool.
         if test "$lua_vdot" = "5.0" -a "$LUA_HAVE_COMPAT51" != 
"HAVE_COMPAT51"; then

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx