subject:"commit rrdtool for openSUSE\:Factory"

commit rrdtool for openSUSE:Factory

2019-10-05 Thread root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2019-10-05 16:17:37

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new.2352 (New)


Package is "rrdtool"

Sat Oct  5 16:17:37 2019 rev:70 rq:732614 version:1.7.2

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2019-02-24 
17:06:31.752591030 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new.2352/rrdtool.changes
2019-10-05 16:17:38.837852492 +0200
@@ -1,0 +2,10 @@
+Sun Sep 22 16:40:00 UTC 2019 - Andreas Stieger 
+
+- rrdtool 1.7.2:
+  * fix segfault on non-existent RRD file when using rrdcached
+  * fix bounds handling, documentation and checking on rrdtool xport
+  * Fix %s/%S unit autoscaling in gprint for json/xml
+  * Optimized PDP Calculation
+- drop rrdtool-1.7.1-compile_fix.patch, upstream
+
+---

Old:

  rrdtool-1.7.1-compile_fix.patch
  rrdtool-1.7.1.tar.gz

New:

  rrdtool-1.7.2.tar.gz



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.CCiCj2/_old  2019-10-05 16:17:39.353851148 +0200
+++ /var/tmp/diff_new_pack.CCiCj2/_new  2019-10-05 16:17:39.353851148 +0200
@@ -12,15 +12,18 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
+%define python python
+%if 0%{?suse_version} >= 1500
+ %define python python3
+%endif
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-
 %bcond_without  lua
 %bcond_without  python
 %bcond_without  ruby
@@ -28,18 +31,14 @@
 %bcond_without  libdbi
 %bcond_without  libwrap
 %bcond_with rados
-%define python python
-%if 0%{?suse_version} >= 1500
- %define python python3
-%endif
 Name:   rrdtool
-Version:1.7.1
+Version:1.7.2
 Release:0
 Summary:Round Robin Database Tool to store and display time-series data
 License:GPL-2.0-or-later AND LGPL-2.0-or-later
 Group:  Productivity/Scientific/Math
-Url:http://oss.oetiker.ch/rrdtool/
-Source0:http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
+URL:https://oss.oetiker.ch/rrdtool/
+Source0:https://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
 Source2:sysconfig.rrdcached
 Source4:rrdcached-systemd-pre
 Source5:rrdcached.service
@@ -48,10 +47,6 @@
 Patch3: rrdtool-tclsegfault.patch
 # PATCH-FIX-UPSTREAM -- bnc#793636
 Patch12:rrdtool-zero_vs_nothing.patch
-%if 0%{?suse_version} >= 1500
-Patch13:python3.patch
-%endif
-Patch14:rrdtool-1.7.1-compile_fix.patch
 # Needed for tests
 BuildRequires:  bc
 BuildRequires:  cairo-devel >= 1.2
@@ -69,6 +64,9 @@
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  zlib-devel
 Requires:   dejavu
+%if 0%{?suse_version} >= 1500
+Patch13:python3.patch
+%endif
 %if %{with python}
 BuildRequires:  %{python}-devel
 BuildRequires:  %{python}-setuptools
@@ -220,7 +218,6 @@
 %if 0%{?suse_version} >= 1500
 %patch13 -p1
 %endif
-%patch14 -p1
 
 # rrd_tool/rrd_cgi: use the date of the last change
 modified="$(sed -n '/^/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
@@ -379,7 +376,8 @@
 
 %if %{with python}
 %files -n %{python}-%{name}
-%doc bindings/python/COPYING bindings/python/README.md
+%license bindings/python/COPYING
+%doc bindings/python/README.md
 %if 0%{?suse_version} >= 1500
 %{python3_sitearch}/*
 %else

++ rrdtool-1.7.1.tar.gz -> rrdtool-1.7.2.tar.gz ++
 11313 lines of diff (skipped)

commit rrdtool for openSUSE:Factory

2019-02-24 Thread root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2019-02-24 17:06:28

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new.28833 (New)


Package is "rrdtool"

Sun Feb 24 17:06:28 2019 rev:69 rq:674551 version:1.7.1

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2018-02-12 
10:09:24.654055148 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new.28833/rrdtool.changes   
2019-02-24 17:06:31.752591030 +0100
@@ -1,0 +2,25 @@
+Wed Feb 13 10:09:13 UTC 2019 - kstreit...@suse.com
+
+- Version update to 1.7.1:
+  * fix many compile time warnings
+  * Re-enable 0-width lines
+  * Include rrd_pdpcalc.pod in Makefile.am also
+  * Lots of spelling fixes for rrdtool source and documentation
+  * fix off by one issue in rrdtool xport output
+  * fix lua extension build
+  * fix python bindings
+  * fix multiple static variable issues in conflict with MT
+  * make translations actually work
+  * Fixed configure --enable / --disable options
+  * rrd_daemon stability fixes
+  * fix tcl bindings
+  * do not call umask ever (not MT safe)
+  * Multiline Titles
+  * French translation
+  * Added support for --allow-shrink with --rigid flag (#843)
+  * Added SUSPEND/RESUME/SUSPENDALL/RESUMEALL commands for rrd_cached
+  * include the daemon name in the error message
+- add rrdtool-1.7.1-compile_fix.patch to fix build with the new
+  version
+
+---

Old:

  rrdtool-1.7.0.tar.gz

New:

  rrdtool-1.7.1-compile_fix.patch
  rrdtool-1.7.1.tar.gz



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.6PIune/_old  2019-02-24 17:06:32.320590761 +0100
+++ /var/tmp/diff_new_pack.6PIune/_new  2019-02-24 17:06:32.320590761 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package rrdtool
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -33,10 +33,10 @@
  %define python python3
 %endif
 Name:   rrdtool
-Version:1.7.0
+Version:1.7.1
 Release:0
 Summary:Round Robin Database Tool to store and display time-series data
-License:GPL-2.0+ AND LGPL-2.0+
+License:GPL-2.0-or-later AND LGPL-2.0-or-later
 Group:  Productivity/Scientific/Math
 Url:http://oss.oetiker.ch/rrdtool/
 Source0:http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
@@ -51,6 +51,7 @@
 %if 0%{?suse_version} >= 1500
 Patch13:python3.patch
 %endif
+Patch14:rrdtool-1.7.1-compile_fix.patch
 # Needed for tests
 BuildRequires:  bc
 BuildRequires:  cairo-devel >= 1.2
@@ -219,6 +220,7 @@
 %if 0%{?suse_version} >= 1500
 %patch13 -p1
 %endif
+%patch14 -p1
 
 # rrd_tool/rrd_cgi: use the date of the last change
 modified="$(sed -n '/^/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"

++ rrdtool-1.7.1-compile_fix.patch ++
diff --git a/etc/Makefile.am b/etc/Makefile.am
index ab763dc..7d18178 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -3,6 +3,6 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat 
rrdcached-default-ls
 
 if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
-   etc/rrdcached.socket \
-   etc/rrdcached.service
+   rrdcached.socket \
+   rrdcached.service
 endif
\ No newline at end of file
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 74b914b..d512fd5 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -368,8 +368,8 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat 
rrdcached-default-ls
rrdcached.socket.in rrdcached.service.in
 
 @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
-@HAVE_SYSTEMD_TRUE@etc/rrdcached.socket \
-@HAVE_SYSTEMD_TRUE@etc/rrdcached.service
+@HAVE_SYSTEMD_TRUE@rrdcached.socket \
+@HAVE_SYSTEMD_TRUE@rrdcached.service
 
 all: all-am

++ rrdtool-1.7.0.tar.gz -> rrdtool-1.7.1.tar.gz ++
 39845 lines of diff (skipped)

commit rrdtool for openSUSE:Factory

2018-02-12 Thread root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2018-02-12 10:09:21

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is "rrdtool"

Mon Feb 12 10:09:21 2018 rev:68 rq:574121 version:1.7.0

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2018-01-16 
09:35:19.301484366 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2018-02-12 
10:09:24.654055148 +0100
@@ -1,0 +2,5 @@
+Sun Feb  4 08:56:33 UTC 2018 - o...@botter.cc
+
+- fix building bindings for Python 2 for suse_version < 1500
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.FL8NzX/_old  2018-02-12 10:09:26.313995325 +0100
+++ /var/tmp/diff_new_pack.FL8NzX/_new  2018-02-12 10:09:26.313995325 +0100
@@ -28,6 +28,10 @@
 %bcond_without  libdbi
 %bcond_without  libwrap
 %bcond_with rados
+%define python python
+%if 0%{?suse_version} >= 1500
+ %define python python3
+%endif
 Name:   rrdtool
 Version:1.7.0
 Release:0
@@ -44,7 +48,9 @@
 Patch3: rrdtool-tclsegfault.patch
 # PATCH-FIX-UPSTREAM -- bnc#793636
 Patch12:rrdtool-zero_vs_nothing.patch
+%if 0%{?suse_version} >= 1500
 Patch13:python3.patch
+%endif
 # Needed for tests
 BuildRequires:  bc
 BuildRequires:  cairo-devel >= 1.2
@@ -63,8 +69,8 @@
 BuildRequires:  zlib-devel
 Requires:   dejavu
 %if %{with python}
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
+BuildRequires:  %{python}-devel
+BuildRequires:  %{python}-setuptools
 %endif
 %if %{with lua}
 BuildRequires:  lua-devel
@@ -150,13 +156,13 @@
 %endif
 
 %if %{with python}
-%package -n python3-%{name}
+%package -n %{python}-%{name}
 Summary:Python bindings for RRDtool
 Group:  Development/Languages/Python
 Requires:   %{name} = %{version}-%{release}
-Requires:   python3
+Requires:   %{python}
 
-%description -n python3-%{name}
+%description -n %{python}-%{name}
 Python RRDtool bindings.
 %endif
 
@@ -210,7 +216,9 @@
 %setup -q
 %patch3
 %patch12 -p1
+%if 0%{?suse_version} >= 1500
 %patch13 -p1
+%endif
 
 # rrd_tool/rrd_cgi: use the date of the last change
 modified="$(sed -n '/^/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
@@ -368,9 +376,13 @@
 %endif
 
 %if %{with python}
-%files -n python3-%{name}
+%files -n %{python}-%{name}
 %doc bindings/python/COPYING bindings/python/README.md
+%if 0%{?suse_version} >= 1500
 %{python3_sitearch}/*
+%else
+%{python_sitearch}/*
+%endif
 %endif
 
 %if %{with ruby}

commit rrdtool for openSUSE:Factory

2018-01-16 Thread root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2018-01-16 09:35:16

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is "rrdtool"

Tue Jan 16 09:35:16 2018 rev:67 rq:561663 version:1.7.0

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2017-12-16 
20:47:14.383306697 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2018-01-16 
09:35:19.301484366 +0100
@@ -7,0 +8,6 @@
+Fri Nov 10 18:20:19 UTC 2017 - jmate...@suse.com
+
+- build bindings for Python 3 instead of Python 2
+  * python3.patch
+
+---

New:

  python3.patch



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.zAutZD/_old  2018-01-16 09:35:20.549425977 +0100
+++ /var/tmp/diff_new_pack.zAutZD/_new  2018-01-16 09:35:20.557425603 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package rrdtool
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -44,6 +44,7 @@
 Patch3: rrdtool-tclsegfault.patch
 # PATCH-FIX-UPSTREAM -- bnc#793636
 Patch12:rrdtool-zero_vs_nothing.patch
+Patch13:python3.patch
 # Needed for tests
 BuildRequires:  bc
 BuildRequires:  cairo-devel >= 1.2
@@ -62,8 +63,8 @@
 BuildRequires:  zlib-devel
 Requires:   dejavu
 %if %{with python}
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 %endif
 %if %{with lua}
 BuildRequires:  lua-devel
@@ -149,13 +150,13 @@
 %endif
 
 %if %{with python}
-%package -n python-%{name}
+%package -n python3-%{name}
 Summary:Python bindings for RRDtool
 Group:  Development/Languages/Python
 Requires:   %{name} = %{version}-%{release}
-Requires:   python
+Requires:   python3
 
-%description -n python-%{name}
+%description -n python3-%{name}
 Python RRDtool bindings.
 %endif
 
@@ -209,6 +210,7 @@
 %setup -q
 %patch3
 %patch12 -p1
+%patch13 -p1
 
 # rrd_tool/rrd_cgi: use the date of the last change
 modified="$(sed -n '/^/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
@@ -217,6 +219,9 @@
 find . -name '*.c' -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" 
"{}" "+"
 
 %build
+# we are patching configure, we need to reconf
+autoreconf -fi
+
 # --disable-nls: there is only partial hungarian translation, does not make 
%{?_smp_mflags}
 #much sense to ship package for it
 %configure \
@@ -363,9 +368,9 @@
 %endif
 
 %if %{with python}
-%files -n python-%{name}
+%files -n python3-%{name}
 %doc bindings/python/COPYING bindings/python/README.md
-%{py_sitedir}/*
+%{python3_sitearch}/*
 %endif
 
 %if %{with ruby}

++ python3.patch ++
Index: rrdtool-1.7.0/m4/acinclude.m4
===
--- rrdtool-1.7.0.orig/m4/acinclude.m4
+++ rrdtool-1.7.0/m4/acinclude.m4
@@ -426,12 +426,7 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
 [AC_REQUIRE([AM_PATH_PYTHON])
 AC_MSG_CHECKING(for headers required to compile python extensions)
 dnl deduce PYTHON_INCLUDES
-py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
-py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-if test "$py_prefix" != "$py_exec_prefix"; then
-  PYTHON_INCLUDES="$PYTHON_INCLUDES 
-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-fi
+PYTHON_INCLUDES="-I"`$PYTHON -c "import sysconfig; 
print(sysconfig.get_path('include'))"`
 AC_SUBST(PYTHON_INCLUDES)
 dnl check if the headers exist:
 save_CPPFLAGS="$CPPFLAGS"

commit rrdtool for openSUSE:Factory

2017-12-16 Thread root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2017-12-16 20:47:08

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is "rrdtool"

Sat Dec 16 20:47:08 2017 rev:66 rq:556699 version:1.7.0

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2017-08-14 
12:34:53.195252578 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2017-12-16 
20:47:14.383306697 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:53:48 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.53xnbk/_old  2017-12-16 20:47:15.279263446 +0100
+++ /var/tmp/diff_new_pack.53xnbk/_new  2017-12-16 20:47:15.283263253 +0100
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %bcond_without  lua
 %bcond_without  python
 %bcond_without  ruby
@@ -286,7 +291,7 @@
 find %{buildroot}%{_docdir}/%{name}/examples/ -type f -exec chmod 0644 "{}" "+"
 
 # install rrdcached specials
-install -D -m 644 %{SOURCE2} 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.rrdcached
+install -D -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.rrdcached
 
 # install systemd specific files
 install -D -m 0755 %{SOURCE4} 
%{buildroot}%{_datadir}/rrdcached/rrdcached-systemd-pre
@@ -380,7 +385,7 @@
 %{_mandir}/man1/rrdcached*
 %{_bindir}/rrdcached
 %{_sbindir}/rcrrdcached
-%{_localstatedir}/adm/fillup-templates/sysconfig.rrdcached
+%{_fillupdir}/sysconfig.rrdcached
 %{_datadir}/rrdcached
 %{_datadir}/rrdcached/rrdcached-systemd-pre
 %{_unitdir}/rrdcached.service

commit rrdtool for openSUSE:Factory

2017-08-14 Thread root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2017-08-14 12:34:49

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is "rrdtool"

Mon Aug 14 12:34:49 2017 rev:65 rq:512347 version:1.7.0

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2017-07-08 
12:26:26.097858919 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2017-08-14 
12:34:53.195252578 +0200
@@ -1,0 +2,10 @@
+Mon Jul 24 12:14:04 UTC 2017 - dims...@opensuse.org
+
+- Only move the lua bindings from /usr/local when needed: this was
+  generally only a hack as our lua.pc 'forgot' to expose the
+  variables INSTALL_CMOD. As lua is now being fixed, this hack is
+  no longer needed (for compatibility with older/broken lua
+  packages we keep it in place, but don't abort if the move
+  failed).
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.TcoyJw/_old  2017-08-14 12:34:55.222967846 +0200
+++ /var/tmp/diff_new_pack.TcoyJw/_new  2017-08-14 12:34:55.234966161 +0200
@@ -270,8 +270,8 @@
 %perl_process_packlist
 
 %if %{with lua}
-# install ruby bindings manually
-mv %{buildroot}%{_prefix}/local/lib/lua %{buildroot}%{_libdir}/lua
+# Move lua lib to the right point, in case lua did not expose the right 
INSTALL_CMOD variable
+mv %{buildroot}%{_prefix}/local/lib/lua %{buildroot}%{_libdir}/lua || true
 %endif
 
 %if %{with ruby}

commit rrdtool for openSUSE:Factory

2017-07-08 Thread root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2017-07-08 12:26:25

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is "rrdtool"

Sat Jul  8 12:26:25 2017 rev:64 rq:508236 version:1.7.0

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2017-01-09 
11:50:29.326717680 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2017-07-08 
12:26:26.097858919 +0200
@@ -1,0 +2,16 @@
+Mon Jul  3 11:22:55 UTC 2017 - tchva...@suse.com
+
+- Cleanup bit with spec-cleaner
+- Move all BR to the top so it is obvious what is needed for which
+  part
+- Build with latest lua not 5.1
+
+---
+Mon Jul  3 11:14:05 UTC 2017 - tchva...@suse.com
+
+- Version update to 1.7.0:
+  * Many coverity scan bugfixes
+  * For full detailed log see CHANGES file
+- Add dependency on python-setuptools for python building
+
+---

Old:

  rrdtool-1.6.0.tar.gz

New:

  rrdtool-1.7.0.tar.gz



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.x39rbV/_old  2017-07-08 12:26:26.833755113 +0200
+++ /var/tmp/diff_new_pack.x39rbV/_new  2017-07-08 12:26:26.833755113 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rrdtool
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,16 +20,14 @@
 %bcond_without  python
 %bcond_without  ruby
 %bcond_without  tcl
-
 %bcond_without  libdbi
 %bcond_without  libwrap
 %bcond_with rados
-
 Name:   rrdtool
-Version:1.6.0
+Version:1.7.0
 Release:0
 Summary:Round Robin Database Tool to store and display time-series data
-License:GPL-2.0+ and LGPL-2.0+
+License:GPL-2.0+ AND LGPL-2.0+
 Group:  Productivity/Scientific/Math
 Url:http://oss.oetiker.ch/rrdtool/
 Source0:http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
@@ -41,8 +39,8 @@
 Patch3: rrdtool-tclsegfault.patch
 # PATCH-FIX-UPSTREAM -- bnc#793636
 Patch12:rrdtool-zero_vs_nothing.patch
-
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+# Needed for tests
+BuildRequires:  bc
 BuildRequires:  cairo-devel >= 1.2
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
@@ -57,7 +55,20 @@
 BuildRequires:  pango-devel >= 1.14
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  zlib-devel
-
+Requires:   dejavu
+%if %{with python}
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools
+%endif
+%if %{with lua}
+BuildRequires:  lua-devel
+%endif
+%if %{with ruby}
+BuildRequires:  ruby-devel
+%endif
+%if %{with tcl}
+BuildRequires:  tcl-devel >= 8.0
+%endif
 %if %{with libdbi}
 BuildRequires:  libdbi-devel
 %endif
@@ -68,8 +79,6 @@
 BuildRequires:  librados2-devel
 %endif
 
-Requires:   dejavu
-
 %description
 RRD stands for Round Robin Database. RRD is a system to store and
 display time-series data (i.e. network bandwidth, machine-room temperature,
@@ -79,7 +88,6 @@
 scripts (from shell or Perl) or via frontends that poll network devices and
 put a friendly user interface on it.
 
-
 %package -n librrd8
 Summary:Round Robin Database tool library
 Group:  System/Libraries
@@ -99,17 +107,15 @@
 server load average). This package allow you to build programs making
 use of the library.
 
-
 %package doc
 Summary:Documentation for rrdtool
-Group:  Documentation
+Group:  Documentation/Howto
 
 %description doc
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
 display time-series data (i.e. network bandwidth, machine-room temperature,
 server load average). This package contains documentation on using RRD.
 
-
 %package -n perl-%{name}
 Summary:Perl bindings for RRDtool
 Group:  Development/Languages/Perl
@@ -123,12 +129,10 @@
 
 This package contains the Perl bindings.
 
-
 %if %{with lua}
 %package -n lua-%{name}
 Summary:Lua bindings for RRDtool
 Group:  Development/Languages/Other
-BuildRequires:  lua51-devel
 Requires:   %{name} = %{version}-%{release}
 
 %description -n lua-%{name}
@@ -143,9 +147,8 @@
 %package -n python-%{name}
 Summary:Python bindings for RRDtool
 Group:  Development/Languages/Python
-BuildRequires:  python-devel >= 2.3
 Requires:   %{name} = %{version}-%{release}
-Requires:   python >= %{python_version}
+Requires:

commit rrdtool for openSUSE:Factory

2016-01-08 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2016-01-08 15:22:17

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is "rrdtool"

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2015-11-24 
22:30:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2016-01-08 
15:22:18.0 +0100
@@ -1,0 +2,17 @@
+Wed Nov 25 12:40:01 UTC 2015 - a...@ajaissle.de
+
+- Update to 1.5.5
+
+  Bugfixes
+  * fix JSON output in xport with legend and gprint blocks
+  * fix parse_time mutex unlocking in the error case
+  * don't crash on invalid variable names in CDEF
+  * add mutex locking in rrdc_fetch
+  * fix buffer overflow in rrd_restore
+  * shorten test precision to 7 digits ... 
+  * never exit from a library function
+  * buffer overflow in rrd_restore.c fixed #669
+
+- Added rrdtool-1.5.4-lua-5.2.patch: lua >= 5.2 uses lua_callk 
+
+---

Old:

  rrdtool-1.5.4.tar.gz

New:

  rrdtool-1.5.4-lua-5.2.patch
  rrdtool-1.5.5.tar.gz



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.HBcKV3/_old  2016-01-08 15:22:19.0 +0100
+++ /var/tmp/diff_new_pack.HBcKV3/_new  2016-01-08 15:22:19.0 +0100
@@ -26,7 +26,7 @@
 %bcond_with rados
 
 Name:   rrdtool
-Version:1.5.4
+Version:1.5.5
 Release:0
 Summary:Round Robin Database Tool to store and display time-series data
 License:GPL-2.0+ and LGPL-2.0+
@@ -41,6 +41,8 @@
 Patch3: rrdtool-tclsegfault.patch
 # PATCH-FIX-UPSTREAM -- bnc#793636
 Patch12:rrdtool-zero_vs_nothing.patch
+# PATCH-FIX-UPSTREAM -- lua >= 5.2 uses lua_callk
+Patch13:rrdtool-1.5.4-lua-5.2.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cairo-devel >= 1.2
@@ -121,7 +123,6 @@
 Group:  Development/Languages/Other
 BuildRequires:  lua51-devel
 Requires:   %{name} = %{version}-%{release}
-Requires:   lua
 
 %description -n lua-%{name}
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -131,6 +132,7 @@
 This package contains the Lua bindings.
 %endif
 
+
 %if %{with python}
 %package -n python-%{name}
 Summary:Python bindings for RRDtool
@@ -143,6 +145,7 @@
 Python RRDtool bindings.
 %endif
 
+
 %if %{with ruby}
 %package -n ruby-%{name}
 Summary:Ruby bindings for RRDtool
@@ -159,6 +162,7 @@
 This package contains the Ruby bindings.
 %endif
 
+
 %if %{with tcl}
 %package -n tcl-%{name}
 Summary:Tcl bindings for RRDtool
@@ -175,6 +179,7 @@
 This package contains the Tcl bindings.
 %endif
 
+
 %package cached
 %define rrdcached_user  rrdcached
 %define rrdcached_group rrdcached
@@ -196,6 +201,7 @@
 %setup -q
 %patch3
 %patch12 -p1
+%patch13 -p1
 
 # rrd_tool/rrd_cgi: use the date of the last change
 modified="$(sed -n '/^/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"

++ rrdtool-1.5.4-lua-5.2.patch ++
diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c
index bfbc174..b54f787 100644
--- a/bindings/lua/rrdlua.c
+++ b/bindings/lua/rrdlua.c
@@ -350,7 +350,7 @@ set_info (lua_State * L)
 
 /**/
 
-static const struct luaL_reg rrd[] = {
+static const struct luaL_Reg rrd[] = {
   {"create", lua_rrd_create},
   {"dump", lua_rrd_dump},
   {"fetch", lua_rrd_fetch},
diff --git a/configure.ac b/configure.ac
index 1a84037..4575f00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -813,7 +813,12 @@ LUA_EOF
   LIBS=
   lua_havelib=no
   LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
-  AC_SEARCH_LIBS(lua_call, lua$lua_vdot lua$lua_vndot lua,
+  if test "$lua_vndot" -ge "52"; then
+CALL_FUNC=lua_callk
+  else
+CALL_FUNC=lua_call
+  fi
+  AC_SEARCH_LIBS($CALL_FUNC, lua$lua_vdot lua$lua_vndot lua,
 [AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua,
   [lua_havelib=LUA$lua_vndot],
   [AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib,
++ rrdtool-1.5.4.tar.gz -> rrdtool-1.5.5.tar.gz ++
 5375 lines of diff (skipped)

commit rrdtool for openSUSE:Factory

2015-11-24 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2015-11-24 22:30:56

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is "rrdtool"

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2015-08-21 
07:37:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2015-11-24 
22:30:58.0 +0100
@@ -1,0 +2,143 @@
+Wed Sep 23 07:55:35 UTC 2015 - a...@ajaissle.de
+
+- Update to 1.5.4
+
+  Bug Fixes
+  * parse floating point numbers according to C locale in rrdtool create
+arguments, regardless of the systems locale setting.
+  * include missing rrd_rados.h into distribution archive
+  * make rrdtool work on ARM again
+  * make rrdtool test suit pass on 32bit OSs
+  * fix --grid-dash option regression in graph
+  * fix systemd support
+  * fix link dependency for libpng since we are using functions directly
+  * fix python module name
+  * fix rrdtool tune to accept U in minimum and maximum options
+  * fi
+  * rrd_parsetime now uses a mutex lock to become thread safe
+  * rrd_xport is now thread safe
+  * stop using MAX_PATH and make everything dynamic and make rrdtool work on
+Gnu HURD ... thanks nirgal!
+
+  Features
+  * new RPN operators: STEPWIDTH, NEWDAY, NEWWEEK, NEWMONTH and NEWWEEK
+together they allow to draw graphs where a rate is converted back to
+absolute numbers and accumulated over a period..
+
+- Changelog 1.5.3
+
+  Bug Fixes
+  * Brought commmand-line options and documentation back into sync.
+  * Make LINE dashes option work again
+
+- Changelog 1.5.2
+
+  Bug Fixes
+  * paramters in VDEF are vnames and not data source names, hence
+they can be 255 chars long and not only 20
+
+- Changelog 1.5.1
+
+  Bug Fixes
+  * parse numbers up to 40 characters long ..
+  * fix install rules for Python and Lua
+  * include missing VERSION and LICENSE file
+  * unlink before rename in rrd_create when running on WIN32
+
+- Changelog 1.5.0
+
+  New Features
+  * automatic x-axis labels that work from 1s to 30y on a single chart
+  * librados integration
+  * new datasource types: DCOUNTER and DDERIVE (they work the same as the
+original DS, except that they can deal with floatingpoint numbers).
+  * compile without graphics libraries: ./configure --disable-rrd_graph
+  * updated windows port (see WIN32-BUILD-TIPS.txt)
+  * single step RRAs for MIN,MAX,LAST are generated virtually from
+an AVERAGE RRA
+  * ignore updates in the past with rrdtool update --skip-past-updates
+  * ignore a LINE when scaling a chart using the skipscale option
+  * detect 32bit timeoverflows
+  * massive performance boost for charts with more than 100 DEF line by
+switching form a linear search to a HASH when searching for data
+  * improved cross compilation support
+  * .Net bindings
+  * allow rrdtool graph to silently skip non-existing source files using the
+--use-nan-for-all-missing-data option
+  * restore from a pipe (rrdtool restore - y.rrd)
+  * in rrdtool create, row count and step can be defined in absolute time
+  * all new "create on steroids" can pull both data and configuration from
+existing rrd files
+  * use rrdtool graph to chart arbitrary data via a callback function for data 
fetching
+support is integrated in the perl bindings.
+  * re-written parser for rrdtool graph commands. It now follows a simple key
+value pattern, compatible with the previous syntax.
+  * MEDIAN op for CDEF expressions
+  * DEPTH,INDEX,COPY,ROL ops for CDEF (as seen in PostScript)
+  * gradient AREA backgrounds
+  * no more locale magic while reading numeric data.
+
+  Bugfixes
+  * all the bugs fixed in 1.4.x during 1.5 development
+
+- Changelog 1.4.9
+
+  New Features
+  * allows rrdrestore to read input from stdin
+  * add documentation for RRDs::xport
+  * RPN operators MINNAN and MAXNAN
+  * --left-axis-format option to rrd_graph
+
+  Bugfixes
+  * properly verify validity of user suplied format strings
+  * remove graph functions from python module when compiled without graphing
+support
+  * verify that only short integers are used in COMPUTE rpn expressions 
+  * eliminate duplicate setlocale calls
+  * fixed endless loop and double frees in rrd_restore
+  * fixed missing variable initializations in rrd_graph
+  * fixed JSON output format to actually be valid JSON
+  * detect failing fallocate and fall back to seeking
+  * fixed format string in ruby bindings
+
+- Changelog 1.4.8
+
+  Highlights
+  * rrd_graph now uses a map to lookup variable names causing graphs with many
+items to be drawn magnitudes faster as the linear search of the variable
+tables is gone now.
+  * the optional argument :skipscale allows for a LINE or AREA instruction to 
be
+

commit rrdtool for openSUSE:Factory

2015-08-20 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2015-08-21 07:37:05

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2015-03-16 
09:37:15.0 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2015-08-21 
07:37:05.0 +0200
@@ -1,0 +2,13 @@
+Fri Jul 31 18:07:53 UTC 2015 - jeng...@inai.de
+
+- Do not hard-depend on systemd, the macros support soft fails.
+- Ignore errors from useradd/groupadd
+- Update RPM groups
+
+---
+Fri Jul 31 09:53:10 UTC 2015 - dims...@opensuse.org
+
+- Ignore absence of systemd-tmpfiles, it won't be present in the
+  build env.
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.kXlWEg/_old  2015-08-21 07:37:06.0 +0200
+++ /var/tmp/diff_new_pack.kXlWEg/_new  2015-08-21 07:37:06.0 +0200
@@ -35,9 +35,9 @@
 BuildRequires:  pango-devel
 BuildRequires:  python-devel
 BuildRequires:  ruby-devel
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  tcl-devel
 BuildRequires:  tcpd-devel
-BuildRequires:  pkgconfig(systemd)
 Requires:   perl = %{perl_version}
 Version:1.4.7
 Release:0
@@ -71,7 +71,7 @@
 
 %package devel
 Summary:A tool for data logging and analysis - Development files
-Group:  Development/Libraries/Other
+Group:  Development/Libraries/C and C++
 Requires:   %name = %version
 
 %description devel
@@ -82,7 +82,7 @@
 
 %package -n python-rrdtool
 Summary:Python bindings for rrdtool
-Group:  Productivity/Scientific/Math
+Group:  Development/Languages/Python
 Requires:   %name = %version
 %py_requires
 
@@ -97,7 +97,7 @@
 
 %package -n lua-rrdtool
 Summary:Lua bindings for rrdtool
-Group:  Productivity/Scientific/Math
+Group:  Development/Languages/Other
 Requires:   %name = %version
 
 %description -n lua-rrdtool
@@ -110,7 +110,7 @@
 
 %package -n ruby-rrdtool
 Summary:Ruby bindings for rrdtool
-Group:  Productivity/Scientific/Math
+Group:  Development/Languages/Ruby
 Requires:   ruby(abi) = %{rb_ver}
 
 %description -n ruby-rrdtool
@@ -123,7 +123,7 @@
 
 %package -n tcl-rrdtool
 Summary:Tcl bindings for rrdtool
-Group:  Productivity/Scientific/Math
+Group:  Development/Languages/Tcl
 Requires:   tcl
 
 %description -n tcl-rrdtool
@@ -139,7 +139,6 @@
 Group:  Productivity/Scientific/Math
 Requires:   %{name} = %{version}
 Requires(pre):  %fillup_prereq
-%{?systemd_requires}
 %define rrdcached_user rrdcached
 %define rrdcached_group rrdcached
 
@@ -311,17 +310,20 @@
 %{_datadir}/rrdcached
 %{_datadir}/rrdcached/rrdcached-systemd-pre
 %{_unitdir}/rrdcached.service
+%if 0%{?suse_version} = 1320
+%dir %_prefix/lib/tmpfiles.d
+%endif
 %{_tmpfilesdir}/rrdcached.conf
 
 %pre cached
-getent group %rrdcached_group /dev/null || groupadd %rrdcached_group
-getent passwd %rrdcached_user /dev/null || useradd -s /sbin/nologin -g 
%rrdcached_group -c %rrdcached_user -d %{_localstatedir}/lib %rrdcached_user
+getent group %rrdcached_group /dev/null || groupadd %rrdcached_group || :
+getent passwd %rrdcached_user /dev/null || useradd -s /sbin/nologin -g 
%rrdcached_group -c %rrdcached_user -d %{_localstatedir}/lib %rrdcached_user || 
:
 %service_add_pre rrdcached.service
 
 %post cached
 %service_add_post rrdcached.service
 %fillup_only rrdcached
-systemd-tmpfiles --create %{_tmpfilesdir}/rrdcached.conf
+systemd-tmpfiles --create %{_tmpfilesdir}/rrdcached.conf || :
 
 %preun cached
 %service_del_preun rrdcached.service

commit rrdtool for openSUSE:Factory

2015-03-16 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2015-03-16 09:37:14

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2014-12-06 
13:45:18.0 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2015-03-16 
09:37:15.0 +0100
@@ -1,0 +2,12 @@
+Tue Mar 10 11:26:06 UTC 2015 - p.drou...@gmail.com
+
+- add rddtool.changes to sources list
+
+---
+Wed Mar  4 15:35:01 UTC 2015 - kstreit...@suse.com
+
+- modify a %prep phase to replace all timestamps in *.c and *.h
+  with the date and time obtained from the last changelog entry
+  bnc#915946
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.bBhgps/_old  2015-03-16 09:37:16.0 +0100
+++ /var/tmp/diff_new_pack.bBhgps/_new  2015-03-16 09:37:16.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package rrdtool
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -55,6 +55,7 @@
 Source2:sysconfig.rrdcached
 Source4:rrdcached-systemd-pre
 Source5:rrdcached.service
+Source99:   %{name}.changes
 Url:http://oss.oetiker.ch/rrdtool/
 Summary:A tool for data logging and analysis
 License:GPL-2.0+
@@ -161,6 +162,10 @@
 %patch11
 popd #cgilib
 %patch12 -p1
+modified=$(sed -n '/^/n;s/ - .*$//;p;q' %{_sourcedir}/%{name}.changes)
+DATE=\$(date -d ${modified} +%%b %%e %%Y)\ 
+TIME=\$(date -d ${modified} +%%R)\ 
+find . -name '*.[ch]' | xargs sed -i 
s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g
 
 %build
 # first prepare cgilib

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2014-12-06 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2014-12-06 13:45:24

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2014-11-24 
11:16:00.0 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2014-12-06 
13:45:18.0 +0100
@@ -1,0 +2,7 @@
+Thu Dec  4 16:40:33 UTC 2014 - kstreit...@suse.com
+
+- add rrdtool-1.4.7-CVE-2013-2131-imginfo_format_check.patch that
+  adds check to the imginfo format to prevent crash or exploit
+  bnc#828003, CVE-2013-2131.
+
+---

New:

  rrdtool-1.4.7-CVE-2013-2131-imginfo_format_check.patch



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.PU26sF/_old  2014-12-06 13:45:19.0 +0100
+++ /var/tmp/diff_new_pack.PU26sF/_new  2014-12-06 13:45:19.0 +0100
@@ -46,6 +46,8 @@
 Patch1: rrdtool-lua-ruby_lib64.patch
 Patch2: rrdtool-tclversion.patch
 Patch3: rrdtool-tclsegfault.patch
+# PATCH-FIX-UPSTREAM bnc#828003 kstreit...@suse.com -- adds check to the 
imginfo format to prevent crash or exploit
+Patch4: rrdtool-1.4.7-CVE-2013-2131-imginfo_format_check.patch
 Source1:
http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
 Patch11:cgilib-fix_automake.patch
 #PATCH FIX UPSTREAM BNC#793636
@@ -154,6 +156,7 @@
 %endif
 %patch2
 %patch3
+%patch4 -p1
 pushd cgilib-%{cgilib_version}
 %patch11
 popd #cgilib

++ rrdtool-1.4.7-CVE-2013-2131-imginfo_format_check.patch ++
Index: rrdtool-1.4.7/src/rrd_graph.c
===
--- rrdtool-1.4.7.orig/src/rrd_graph.c
+++ rrdtool-1.4.7/src/rrd_graph.c
@@ -4016,6 +4016,12 @@ rrd_info_t *rrd_graph_v(
 char *path;
 char *filename;
 
+if (bad_format_imginfo(im.imginfo)) {
+rrd_info_free(im.grinfo);
+im_free(im);
+rrd_set_error(bad format for imginfo);
+return NULL;
+}
 path = strdup(im.graphfile);
 filename = basename(path);
 info.u_str =
@@ -4820,6 +4826,51 @@ int bad_format(
 }
 
 
+int bad_format_imginfo(
+char *fmt)
+{
+char *ptr;
+int   n = 0;
+
+ptr = fmt;
+while (*ptr != '\0')
+if (*ptr++ == '%') {
+
+/* line cannot end with percent char */
+if (*ptr == '\0')
+return 1;
+/* '%%' is allowed */
+if (*ptr == '%')
+ptr++;
+/* '%s', '%S' are allowed */
+else if (*ptr == 's' || *ptr == 'S') {
+n = 1;
+ptr++;
+}
+
+/* or else '% 4lu' and such are allowed */
+else {
+/* optional padding character */
+if (*ptr == ' ')
+ptr++;
+/* This should take care of 'm' */
+while (*ptr = '0'  *ptr = '9')
+ptr++;
+/* 'lu' must follow here */
+if (*ptr++ != 'l')
+return 1;
+if (*ptr == 'u')
+ptr++;
+else
+return 1;
+n++;
+}
+}
+
+return (n != 3);
+}
+
+
 int vdef_parse(
 struct graph_desc_t
 *gdes,
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2014-11-24 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2014-11-24 11:15:53

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2014-02-15 
17:18:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2014-11-24 
11:16:00.0 +0100
@@ -1,0 +2,11 @@
+Sun Nov 23 06:16:00 UTC 2014 - Led led...@gmail.com
+
+- fix bashisms in rrdcached-systemd-pre script
+
+---
+Wed Nov 19 22:59:24 UTC 2014 - dims...@opensuse.org
+
+- Replace systemd BuildRequires with pkgconfig(systemd): we do not
+  require the full installation / dep chain of systemd.
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.tzm6oW/_old  2014-11-24 11:16:04.0 +0100
+++ /var/tmp/diff_new_pack.tzm6oW/_new  2014-11-24 11:16:04.0 +0100
@@ -35,9 +35,9 @@
 BuildRequires:  pango-devel
 BuildRequires:  python-devel
 BuildRequires:  ruby-devel
-BuildRequires:  systemd
 BuildRequires:  tcl-devel
 BuildRequires:  tcpd-devel
+BuildRequires:  pkgconfig(systemd)
 Requires:   perl = %{perl_version}
 Version:1.4.7
 Release:0

++ rrdcached-systemd-pre ++
--- /var/tmp/diff_new_pack.tzm6oW/_old  2014-11-24 11:16:04.0 +0100
+++ /var/tmp/diff_new_pack.tzm6oW/_new  2014-11-24 11:16:04.0 +0100
@@ -17,14 +17,14 @@
 # Read config   
 . $RRDCACHED_CONFIG
 
-function check_and_create_dir(){
+check_and_create_dir() {
 local DIR=$1
 test -d $DIR || mkdir -p $DIR
 }
 
 case $RRDCACHED_ADDRESS in
-^unix:) 
-SOCKETDIR=$(dirname ${RRDCACHED_ADDRESS/unix:/})
+unix:*)
+SOCKETDIR=$(dirname ${RRDCACHED_ADDRESS#unix:})
 check_and_create_dir $SOCKETDIR
 chgrp $RRDCACHED_GROUP $SOCKETDIR
 ;;

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2014-02-15 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2014-02-15 17:18:03

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2014-01-23 
15:55:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2014-02-15 
17:18:04.0 +0100
@@ -1,0 +2,8 @@
+Sun Feb  9 08:58:51 UTC 2014 - o...@botter.cc
+
+- again fix PIDfile handling for rrdcached in systemd file
+  (ugly now: because of removal of declaration in sysconfig file;
+  it has to be declared twice in service file)
+- add PIDfile directory using tmpfiles now
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.D4ctMp/_old  2014-02-15 17:18:05.0 +0100
+++ /var/tmp/diff_new_pack.D4ctMp/_new  2014-02-15 17:18:05.0 +0100
@@ -16,6 +16,8 @@
 #
 
 
+%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
+
 Name:   rrdtool
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -243,7 +245,9 @@
 # install systemd specific files
 install -Dm755 %{SOURCE4} 
%{buildroot}%{_datadir}/rrdcached/rrdcached-systemd-pre
 install -Dm644 %{SOURCE5} %{buildroot}%{_unitdir}/rrdcached.service
-mkdir -p %{buildroot}%{_localstatedir}/lib/rrdtool/rrdcached
+install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
+echo d /run/rrdcached 0755 %{rrdcached_user} %{rrdcached_group}  
%{buildroot}/%{_tmpfilesdir}/rrdcached.conf
+chmod 644 %{buildroot}/%{_tmpfilesdir}/rrdcached.conf
 
 %post -p /sbin/ldconfig
 
@@ -296,11 +300,10 @@
 %defattr(-, root, root)
 %{_bindir}/rrdcached
 %{_localstatedir}/adm/fillup-templates/sysconfig.rrdcached
-%dir %{_localstatedir}/lib/rrdtool
-%attr(-,%rrdcached_user,%rrdcached_group) %dir 
%{_localstatedir}/lib/rrdtool/rrdcached
 %{_datadir}/rrdcached
 %{_datadir}/rrdcached/rrdcached-systemd-pre
 %{_unitdir}/rrdcached.service
+%{_tmpfilesdir}/rrdcached.conf
 
 %pre cached
 getent group %rrdcached_group /dev/null || groupadd %rrdcached_group
@@ -310,6 +313,7 @@
 %post cached
 %service_add_post rrdcached.service
 %fillup_only rrdcached
+systemd-tmpfiles --create %{_tmpfilesdir}/rrdcached.conf
 
 %preun cached
 %service_del_preun rrdcached.service

++ rrdcached-systemd-pre ++
--- /var/tmp/diff_new_pack.D4ctMp/_old  2014-02-15 17:18:05.0 +0100
+++ /var/tmp/diff_new_pack.D4ctMp/_new  2014-02-15 17:18:05.0 +0100
@@ -14,8 +14,6 @@
 if [ $1 = stop ]; then exit 0;
 else exit 6; fi; }
 
-RRDCACHED_PID='/run/rrdcached.pid'
-
 # Read config   
 . $RRDCACHED_CONFIG
 
@@ -24,8 +22,6 @@
 test -d $DIR || mkdir -p $DIR
 }
 
-check_and_create_dir $(dirname $RRDCACHED_PID)
-chown $RRDCACHED_USER:$RRDCACHED_GROUP $(dirname $RRDCACHED_PID)
 case $RRDCACHED_ADDRESS in
 ^unix:) 
 SOCKETDIR=$(dirname ${RRDCACHED_ADDRESS/unix:/})

++ rrdcached.service ++
--- /var/tmp/diff_new_pack.D4ctMp/_old  2014-02-15 17:18:05.0 +0100
+++ /var/tmp/diff_new_pack.D4ctMp/_new  2014-02-15 17:18:05.0 +0100
@@ -16,10 +16,10 @@
 ExecStartPre=-/bin/echo 'Starting RRD data caching service (rrdtools - 
rrdcached)'
 ExecStartPre=/bin/sh -c /usr/share/rrdcached/rrdcached-systemd-pre
 EnvironmentFile=-/etc/sysconfig/rrdcached
-ExecStart=/usr/bin/rrdcached -s $RRDCACHED_GROUP -b $RRDCACHED_CHROOT_DIR -p 
$RRDCACHED_PID -l $RRDCACHED_ADDRESS -m $RRDCACHED_SOCKET_MASK -w 
$RRDCACHED_DISKWRITE -z $RRDCACHED_DELAY -t $RRDCACHED_WRITE_THREADS 
$RRDCACHED_OPTIONS
+ExecStart=/usr/bin/rrdcached -s $RRDCACHED_GROUP -b $RRDCACHED_CHROOT_DIR -p 
/run/rrdcached/rrdcached.pid -l $RRDCACHED_ADDRESS -m $RRDCACHED_SOCKET_MASK -w 
$RRDCACHED_DISKWRITE -z $RRDCACHED_DELAY -t $RRDCACHED_WRITE_THREADS 
$RRDCACHED_OPTIONS
 Restart=always
 RestartSec=1
-PIDFile=/run/rrdcached.pid
+PIDFile=/run/rrdcached/rrdcached.pid
 TimeoutStopSec=10
 
 [Install]

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2014-01-23 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2014-01-20 20:44:12

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2013-11-19 
10:46:11.0 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2014-01-23 
15:55:45.0 +0100
@@ -1,0 +2,10 @@
+Mon Jan 13 08:42:10 UTC 2014 - co...@suse.com
+
+- don't require ruby, the package but the right version of the abi
+
+---
+Thu Jan  9 13:21:12 UTC 2014 - jreidin...@suse.com
+
+- fix build for ruby 2.1 
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.oZ4w4J/_old  2014-01-23 15:55:46.0 +0100
+++ /var/tmp/diff_new_pack.oZ4w4J/_new  2014-01-23 15:55:46.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package rrdtool
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -106,7 +106,7 @@
 %package -n ruby-rrdtool
 Summary:Ruby bindings for rrdtool
 Group:  Productivity/Scientific/Math
-Requires:   ruby
+Requires:   ruby(abi) = %{rb_ver}
 
 %description -n ruby-rrdtool
 A tool to log and analyze data gathered from all kinds of data sources.
@@ -224,6 +224,7 @@
 find %{buildroot} -type f -name '*.la' -exec %__rm {} \;
 # install ruby bindings
 pushd bindings/ruby
+mkdir -p %{buildroot}/%{rb_sitearchdir}
 make DESTDIR=%{buildroot} install
 popd
 # documentation

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2013-11-19 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2013-11-19 10:46:10

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2013-10-06 
14:32:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2013-11-19 
10:46:11.0 +0100
@@ -1,0 +2,8 @@
+Mon Nov 18 11:33:36 UTC 2013 - vdziewie...@suse.com
+
+- Fix bnc#793636 almost undistinguishable wheter there is no data
+  or zero valued data on the rendered graph - rrdtool-zero_vs_nothing.patch  
+- I did this to prepare rrdtool for SLE12 - bnc#831773 - [openSUSE goes 
SLE12]: rrdtool: Change and/or patches may have been lost
+
+
+---

New:

  rrdtool-zero_vs_nothing.patch



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.Uyhon5/_old  2013-11-19 10:46:12.0 +0100
+++ /var/tmp/diff_new_pack.Uyhon5/_new  2013-11-19 10:46:12.0 +0100
@@ -46,6 +46,8 @@
 Patch3: rrdtool-tclsegfault.patch
 Source1:
http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
 Patch11:cgilib-fix_automake.patch
+#PATCH FIX UPSTREAM BNC#793636
+Patch12:rrdtool-zero_vs_nothing.patch
 Source2:sysconfig.rrdcached
 Source4:rrdcached-systemd-pre
 Source5:rrdcached.service
@@ -153,6 +155,7 @@
 pushd cgilib-%{cgilib_version}
 %patch11
 popd #cgilib
+%patch12 -p1
 
 %build
 # first prepare cgilib

++ rrdtool-zero_vs_nothing.patch ++
Index: rrdtool-1.4.7/src/rrd_gfx.c
===
--- rrdtool-1.4.7.orig/src/rrd_gfx.c
+++ rrdtool-1.4.7/src/rrd_gfx.c
@@ -293,10 +293,10 @@ void gfx_line_fit(
 line_width = cairo_get_line_width(cr);
 line_height = line_width;
 cairo_user_to_device_distance(cr, line_width, line_height);
-line_width = line_width / 2.0 - ceil(line_width / 2.0);
-line_height = line_height / 2.0 - ceil(line_height / 2.0);
-*x = floor(*x - 0.5) - line_width;
-*y = ceil(*y + 0.5) + line_height;
+line_width = line_width / 2.0 - (long) (line_width / 2.0);
+line_height = line_height / 2.0 - (long) (line_height / 2.0);
+*x = (double) ((long) (*x + 0.5)) - line_width;
+*y = (double) ((long) (*y + 0.5)) + line_height;
 cairo_device_to_user(cr, x, y);
 }
 
@@ -312,7 +312,7 @@ void gfx_area_fit(
 if (!im-gridfit)
 return;
 cairo_user_to_device(cr, x, y);
-*x = floor(*x);
-*y = ceil(*y);
+*x = (double) ((long) (*x + 0.5));
+*y = (double) ((long) (*y + 0.5));
 cairo_device_to_user(cr, x, y);
 }
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2013-10-06 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2013-10-06 14:32:41

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2013-10-04 
10:28:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2013-10-06 
14:32:44.0 +0200
@@ -1,0 +2,12 @@
+Fri Oct  4 17:01:23 UTC 2013 - p.drou...@gmail.com
+
+- Remove PIDfile definition of sysconfig file and add it in systemd
+  service file
+- Fix PIDfile location to /run instead of var/lib/rccached
+
+---
+Fri Oct  4 10:40:05 UTC 2013 - o...@botter.cc
+
+- fix rrdcached service file (type=forking), add pid file variable
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.jyPlZu/_old  2013-10-06 14:32:45.0 +0200
+++ /var/tmp/diff_new_pack.jyPlZu/_new  2013-10-06 14:32:45.0 +0200
@@ -17,25 +17,25 @@
 
 
 Name:   rrdtool
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  cairo-devel
 BuildRequires:  freetype2-devel
+BuildRequires:  gettext-tools
 BuildRequires:  glib2-devel
 BuildRequires:  groff
 BuildRequires:  intltool
 BuildRequires:  libart_lgpl-devel
 BuildRequires:  libpng-devel
+BuildRequires:  libtool
 BuildRequires:  libxml2-devel
+BuildRequires:  lua51-devel
 BuildRequires:  pango-devel
 BuildRequires:  python-devel
-BuildRequires:  tcl-devel
-BuildRequires:  gettext-tools
 BuildRequires:  ruby-devel
-BuildRequires:  lua51-devel
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
-BuildRequires:  tcpd-devel
 BuildRequires:  systemd
+BuildRequires:  tcl-devel
+BuildRequires:  tcpd-devel
 Requires:   perl = %{perl_version}
 Version:1.4.7
 Release:0
@@ -241,7 +241,6 @@
 install -Dm644 %{SOURCE5} %{buildroot}%{_unitdir}/rrdcached.service
 mkdir -p %{buildroot}%{_localstatedir}/lib/rrdtool/rrdcached
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig

++ rrdcached-systemd-pre ++
--- /var/tmp/diff_new_pack.jyPlZu/_old  2013-10-06 14:32:45.0 +0200
+++ /var/tmp/diff_new_pack.jyPlZu/_new  2013-10-06 14:32:45.0 +0200
@@ -14,7 +14,7 @@
 if [ $1 = stop ]; then exit 0;
 else exit 6; fi; }
 
-RRDCACHED_PID='/var/lib/rrdtool/rrdcached/rrdcached.pid'
+RRDCACHED_PID='/run/rrdcached.pid'
 
 # Read config   
 . $RRDCACHED_CONFIG

++ rrdcached.service ++
--- /var/tmp/diff_new_pack.jyPlZu/_old  2013-10-06 14:32:45.0 +0200
+++ /var/tmp/diff_new_pack.jyPlZu/_new  2013-10-06 14:32:45.0 +0200
@@ -12,13 +12,14 @@
 After=network.target
 
 [Service]
+Type=forking
 ExecStartPre=-/bin/echo 'Starting RRD data caching service (rrdtools - 
rrdcached)'
 ExecStartPre=/bin/sh -c /usr/share/rrdcached/rrdcached-systemd-pre
 EnvironmentFile=-/etc/sysconfig/rrdcached
 ExecStart=/usr/bin/rrdcached -s $RRDCACHED_GROUP -b $RRDCACHED_CHROOT_DIR -p 
$RRDCACHED_PID -l $RRDCACHED_ADDRESS -m $RRDCACHED_SOCKET_MASK -w 
$RRDCACHED_DISKWRITE -z $RRDCACHED_DELAY -t $RRDCACHED_WRITE_THREADS 
$RRDCACHED_OPTIONS
 Restart=always
 RestartSec=1
-PIDFile=$RRDCACHED_PID
+PIDFile=/run/rrdcached.pid
 TimeoutStopSec=10
 
 [Install]

++ sysconfig.rrdcached ++
--- /var/tmp/diff_new_pack.jyPlZu/_old  2013-10-06 14:32:45.0 +0200
+++ /var/tmp/diff_new_pack.jyPlZu/_new  2013-10-06 14:32:45.0 +0200
@@ -102,3 +102,4 @@
 # Other options - see man 1 rrdcached
 #
 RRDCACHED_OPTIONS=
+

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2013-10-04 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2013-10-04 10:28:11

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2013-07-12 
20:57:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2013-10-04 
10:28:11.0 +0200
@@ -1,0 +2,12 @@
+Thu Oct  3 14:41:37 UTC 2013 - p.drou...@gmail.com
+
+- Build is disable for SLE; remove sysvinit support
+- CLean obsolete conditionnal macros
+- Fix devel package Group; it have to be Development/Libraries
+
+---
+Wed Oct  2 13:40:14 UTC 2013 - o...@botter.cc
+
+- add systemd service for rrdcached
+
+---

New:

  rrdcached-systemd-pre
  rrdcached.service
  sysconfig.rrdcached



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.9DNOQg/_old  2013-10-04 10:28:13.0 +0200
+++ /var/tmp/diff_new_pack.9DNOQg/_new  2013-10-04 10:28:13.0 +0200
@@ -28,21 +28,14 @@
 BuildRequires:  pango-devel
 BuildRequires:  python-devel
 BuildRequires:  tcl-devel
-%if 0%{?suse_version} = 1100
 BuildRequires:  gettext-tools
-%else
-BuildRequires:  gettext
-%endif
 BuildRequires:  ruby-devel
-%if 0%{?suse_version}  1210
 BuildRequires:  lua51-devel
-%else
-BuildRequires:  lua-devel
-%endif
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  tcpd-devel
+BuildRequires:  systemd
 Requires:   perl = %{perl_version}
 Version:1.4.7
 Release:0
@@ -53,12 +46,15 @@
 Patch3: rrdtool-tclsegfault.patch
 Source1:
http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
 Patch11:cgilib-fix_automake.patch
+Source2:sysconfig.rrdcached
+Source4:rrdcached-systemd-pre
+Source5:rrdcached.service
 Url:http://oss.oetiker.ch/rrdtool/
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Summary:A tool for data logging and analysis
 License:GPL-2.0+
 Group:  Productivity/Scientific/Math
 Requires:   dejavu
+Requires(pre):  pwdutils
 
 %description
 A tool to log and analyze data gathered from all kinds of data sources.
@@ -66,6 +62,87 @@
 generate graphical representations of the data values collected over a
 definable time period.
 
+%package devel
+Summary:A tool for data logging and analysis - Development files
+Group:  Development/Libraries/Other
+Requires:   %name = %version
+
+%description devel
+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.
+
+%package -n python-rrdtool
+Summary:Python bindings for rrdtool
+Group:  Productivity/Scientific/Math
+Requires:   %name = %version
+%py_requires
+
+%description -n python-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 Python bindings
+
+
+%package -n lua-rrdtool
+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
+
+%package -n ruby-rrdtool
+Summary:Ruby bindings for rrdtool
+Group:  Productivity/Scientific/Math
+Requires:   ruby
+
+%description -n ruby-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 Ruby bindings
+
+%package -n tcl-rrdtool
+Summary:Tcl bindings for rrdtool
+Group:  Productivity/Scientific/Math
+Requires:   tcl
+
+%description -n tcl-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

commit rrdtool for openSUSE:Factory

2013-07-12 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2013-07-12 20:57:40

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2013-06-06 
15:06:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2013-07-12 
20:57:41.0 +0200
@@ -1,0 +2,7 @@
+Wed Jul 10 15:02:53 UTC 2013 - dval...@suse.com
+
+- rename rrdtool-lua_lib64.patch to rrdtool-lua-ruby_lib64.patch 
+  since it sets libdir for ruby as well
+- Package ruby bindings into ruby-rrdtool package
+
+---

Old:

  rrdtool-lua_lib64.patch

New:

  rrdtool-lua-ruby_lib64.patch



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.ttvu0X/_old  2013-07-12 20:57:42.0 +0200
+++ /var/tmp/diff_new_pack.ttvu0X/_new  2013-07-12 20:57:42.0 +0200
@@ -48,7 +48,7 @@
 Release:0
 %define cgilib_version 0.7
 Source: http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
-Patch1: rrdtool-lua_lib64.patch
+Patch1: rrdtool-lua-ruby_lib64.patch
 Patch2: rrdtool-tclversion.patch
 Patch3: rrdtool-tclsegfault.patch
 Source1:
http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
@@ -243,4 +243,21 @@
 %{tcl_archdir}/*
 %{_libdir}/tclrrd*.so
 
+%package -n ruby-rrdtool
+Summary:Ruby bindings for rrdtool
+Group:  Productivity/Scientific/Math
+Requires:   ruby
+
+%description -n ruby-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 Ruby bindings
+
+%files -n ruby-rrdtool
+%defattr(-, root, root)
+%{rb_archdir}/RRD.so
+
 %changelog

++ rrdtool-lua-ruby_lib64.patch ++
Index: configure
===
--- configure.orig
+++ configure
@@ -27550,7 +27550,7 @@ fi
 if test ${enable_ruby_site_install+set} = set; then
   enableval=$enable_ruby_site_install; RUBY_MAKE_OPTIONS=
 else
-  RUBY_MAKE_OPTIONS=sitedir=$langpref/lib/ruby
+  RUBY_MAKE_OPTIONS=sitedir=$langpref/lib64/ruby
 fi
 
 
@@ -29316,7 +29316,7 @@ fi
   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
Index: configure.ac
===
--- configure.ac.orig
+++ configure.ac
@@ -675,7 +675,7 @@ fi
 dnl pass additional ruby options when generating Makefile from Makefile.PL
 AC_ARG_ENABLE(ruby-site-install,
 AS_HELP_STRING([--enable-ruby-site-install],[by default the rrdtool ruby 
modules are installed together with rrdtool in $prefix/lib/ruby. You have to 
add $prefix/lib/ruby/$ruby_version/$sitearch to your $: variable for ruby to 
find the RRD.so file.]),
-[RUBY_MAKE_OPTIONS=],[RUBY_MAKE_OPTIONS=sitedir=$langpref/lib/ruby])
+[RUBY_MAKE_OPTIONS=],[RUBY_MAKE_OPTIONS=sitedir=$langpref/lib64/ruby])
 
 
 AC_ARG_WITH(ruby-options,
@@ -782,7 +782,7 @@ LUA_EOF
   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
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2013-06-06 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2013-06-06 15:06:42

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2013-04-05 
17:05:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2013-06-06 
15:06:43.0 +0200
@@ -1,0 +2,17 @@
+Sat Jun  1 09:20:20 UTC 2013 - sch...@suse.de
+
+- Work around makefile dependencies on installed ruby headers during
+  installation
+- Avoid running autoreconf, remove rrdtool-automake.patch
+
+---
+Wed May 29 11:07:08 UTC 2013 - mhruse...@suse.com
+
+- Fix the hack from previous entry to work everywhere
+
+---
+Thu May 16 13:54:25 UTC 2013 - vdziewie...@suse.com
+
+- Fix build failure: make looks for ruby.h in wrong place. 
+
+---

Old:

  rrdtool-automake.patch



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.OnWg0W/_old  2013-06-06 15:06:43.0 +0200
+++ /var/tmp/diff_new_pack.OnWg0W/_new  2013-06-06 15:06:43.0 +0200
@@ -51,7 +51,6 @@
 Patch1: rrdtool-lua_lib64.patch
 Patch2: rrdtool-tclversion.patch
 Patch3: rrdtool-tclsegfault.patch
-Patch4: rrdtool-automake.patch
 Source1:
http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
 Patch11:cgilib-fix_automake.patch
 Url:http://oss.oetiker.ch/rrdtool/
@@ -74,7 +73,6 @@
 %endif
 %patch2
 %patch3
-%patch4 -p1
 pushd cgilib-%{cgilib_version}
 %patch11
 popd #cgilib
@@ -102,11 +100,6 @@
 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} \
@@ -117,6 +110,8 @@
 
 %install
 #eval `perl -V:installarchlib`
+# Override hdrdir and rubyhdrdir to avoid makefile dependencies on
+# installed ruby headers to be prefixed with %{buildroot}
 make \
 DESTDIR=$RPM_BUILD_ROOT \
 idocdir=%{_docdir}/%{name}/txt/ \
@@ -124,6 +119,8 @@
 examplesdir=%{_docdir}/%{name}/examples/ \
 libdir=%{_libdir} \
 pkglibdir=%tcl_archdir/tclrrd%version \
+hdrdir=%{_includedir}/ruby-2.0.0 \
+rubyhdrdir=%{_includedir}/ruby-2.0.0 \
 install
 # we install this later again
 rm -r $RPM_BUILD_ROOT%{_prefix}/lib/perl

++ rrdtool-lua_lib64.patch ++
--- /var/tmp/diff_new_pack.OnWg0W/_old  2013-06-06 15:06:43.0 +0200
+++ /var/tmp/diff_new_pack.OnWg0W/_new  2013-06-06 15:06:43.0 +0200
@@ -1,6 +1,21 @@
 configure.ac.orig  2010-12-28 03:34:15.0 +0100
-+++ configure.ac   2010-12-28 03:34:27.0 +0100
-@@ -783,7 +783,7 @@
+Index: configure
+===
+--- configure.orig
 configure
+@@ -29316,7 +29316,7 @@ fi
+   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
+Index: configure.ac
+===
+--- configure.ac.orig
 configure.ac
+@@ -782,7 +782,7 @@ LUA_EOF
done
  fi
  

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2013-04-05 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2013-04-05 17:05:39

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool, Maintainer is vdziewie...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2013-01-13 
14:30:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2013-04-05 
17:05:40.0 +0200
@@ -1,0 +2,5 @@
+Fri Apr  5 12:35:29 UTC 2013 - idon...@suse.com
+
+- Add Source URL, see https://en.opensuse.org/SourceUrls
+
+---

Old:

  cgilib-0.7.tar.bz2

New:

  cgilib-0.7.tar.gz



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.scM9f1/_old  2013-04-05 17:05:41.0 +0200
+++ /var/tmp/diff_new_pack.scM9f1/_new  2013-04-05 17:05:41.0 +0200
@@ -47,14 +47,12 @@
 Version:1.4.7
 Release:0
 %define cgilib_version 0.7
-# http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
-Source: %{name}-%{version}.tar.gz
+Source: http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
 Patch1: rrdtool-lua_lib64.patch
 Patch2: rrdtool-tclversion.patch
 Patch3: rrdtool-tclsegfault.patch
 Patch4: rrdtool-automake.patch
-# 
http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
-Source1:cgilib-%{cgilib_version}.tar.bz2
+Source1:
http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
 Patch11:cgilib-fix_automake.patch
 Url:http://oss.oetiker.ch/rrdtool/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2013-01-13 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2013-01-13 14:30:27

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool, Maintainer is vdziewie...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2012-10-27 
13:24:45.0 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2013-01-13 
14:30:29.0 +0100
@@ -1,0 +2,5 @@
+Sat Jan 12 19:17:30 UTC 2013 - co...@suse.com
+
+- remove suse_update_config
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.aUj7lV/_old  2013-01-13 14:30:30.0 +0100
+++ /var/tmp/diff_new_pack.aUj7lV/_new  2013-01-13 14:30:30.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package rrdtool
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -101,7 +101,6 @@
 popd #cgilib
 
 # build rrdtool
-%{suse_update_config}
 if [ ! -d m4 ]; then mkdir m4; fi
 # we need getext 0.18
 #autoreconf -i -f

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2012-10-27 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2012-10-27 13:24:44

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool, Maintainer is vdziewie...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2012-05-29 
11:36:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2012-10-27 
13:24:45.0 +0200
@@ -1,0 +2,5 @@
+Fri Oct 26 15:34:06 UTC 2012 - co...@suse.com
+
+- add explicit buildrequire on groff for man pages
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.Pa2IoR/_old  2012-10-27 13:24:47.0 +0200
+++ /var/tmp/diff_new_pack.Pa2IoR/_new  2012-10-27 13:24:47.0 +0200
@@ -20,6 +20,7 @@
 BuildRequires:  cairo-devel
 BuildRequires:  freetype2-devel
 BuildRequires:  glib2-devel
+BuildRequires:  groff
 BuildRequires:  intltool
 BuildRequires:  libart_lgpl-devel
 BuildRequires:  libpng-devel

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2012-05-29 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2012-05-29 11:36:24

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool, Maintainer is vdziewie...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2012-04-17 
22:01:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2012-05-29 
11:36:26.0 +0200
@@ -1,0 +2,5 @@
+Thu May 24 10:25:44 UTC 2012 - idon...@suse.com
+
+- Fix build with new automake 
+
+---

New:

  rrdtool-automake.patch



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.gaBhJg/_old  2012-05-29 11:36:27.0 +0200
+++ /var/tmp/diff_new_pack.gaBhJg/_new  2012-05-29 11:36:27.0 +0200
@@ -51,6 +51,7 @@
 Patch1: rrdtool-lua_lib64.patch
 Patch2: rrdtool-tclversion.patch
 Patch3: rrdtool-tclsegfault.patch
+Patch4: rrdtool-automake.patch
 # 
http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
 Source1:cgilib-%{cgilib_version}.tar.bz2
 Patch11:cgilib-fix_automake.patch
@@ -74,6 +75,7 @@
 %endif
 %patch2
 %patch3
+%patch4 -p1
 pushd cgilib-%{cgilib_version}
 %patch11
 popd #cgilib

++ rrdtool-automake.patch ++
Index: rrdtool-1.4.7/bindings/tcl/Makefile.am
===
--- rrdtool-1.4.7.orig/bindings/tcl/Makefile.am
+++ rrdtool-1.4.7/bindings/tcl/Makefile.am
@@ -27,8 +27,9 @@ tclpkgdir = @TCL_PACKAGE_DIR@
 tclpkg_DATA = pkgIndex.tcl
 tclpkg_SCRIPTS = ifOctets.tcl
 else
-pkglib_DATA = pkgIndex.tcl
-pkglib_SCRIPTS = ifOctets.tcl
+datalibdir=$(pkglibdir)
+datalib_DATA = pkgIndex.tcl
+datalib_SCRIPTS = ifOctets.tcl
 endif
 
 # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2012-04-17 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2012-04-17 22:01:11

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool, Maintainer is vdziewie...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2012-03-07 
13:45:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2012-04-17 
22:01:14.0 +0200
@@ -1,0 +2,5 @@
+Tue Apr  3 11:52:10 UTC 2012 - sasc...@suse.de
+
+- Only require lua51-devel on openSUSE_12.2 or later
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.pEPIWO/_old  2012-04-17 22:01:16.0 +0200
+++ /var/tmp/diff_new_pack.pEPIWO/_new  2012-04-17 22:01:16.0 +0200
@@ -33,7 +33,7 @@
 BuildRequires:  gettext
 %endif
 BuildRequires:  ruby-devel
-%if 0%{?suse_version} = 1120
+%if 0%{?suse_version}  1210
 BuildRequires:  lua51-devel
 %else
 BuildRequires:  lua-devel

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2012-03-07 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2012-03-07 13:45:26

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool, Maintainer is vdziewie...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2012-01-31 
10:22:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2012-03-07 
13:45:27.0 +0100
@@ -1,0 +2,19 @@
+Mon Mar  5 11:41:55 UTC 2012 - vdziewie...@suse.com
+
+- update to 1.4.7
+   * check in /usr/lib64 for tclConfig.sh too
+   * remove perl 5.004 compatibility hack and make RRDs compile with newer
+ perls.
+   * added support for rrdgraph to use the yotta, zetta, zepto, yocto 
prefixes.
+   * configure option to disable building rrd_graph: --disable-rrd_graph
+  With support from Ulf Zimmermann (OpenLane)
+   * fixed segfault in rrdtool (xport, fetch, graph) when handling
+  error conditions. -- James Brown
+   * fix uninitialized variable in rrd_graph (#322)
+   * improved data reduction algorithm in graph: after fetching, data must 
be
+  reduced to at least chart resolution, else some data will not get 
plotted.
+ fix for #298
+   * plug memory leak in lua bindings #301
+   * improve cross compiling -- Michael Olbrich
+
+---

Old:

  rrdtool-1.4.5.tar.bz2

New:

  rrdtool-1.4.7.tar.gz



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.8wRLXY/_old  2012-03-07 13:45:29.0 +0100
+++ /var/tmp/diff_new_pack.8wRLXY/_new  2012-03-07 13:45:29.0 +0100
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:   rrdtool
 BuildRequires:  cairo-devel
 BuildRequires:  freetype2-devel
@@ -42,11 +43,11 @@
 BuildRequires:  libtool
 BuildRequires:  tcpd-devel
 Requires:   perl = %{perl_version}
-Version:1.4.5
+Version:1.4.7
 Release:0
 %define cgilib_version 0.7
 # http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.gz
 Patch1: rrdtool-lua_lib64.patch
 Patch2: rrdtool-tclversion.patch
 Patch3: rrdtool-tclsegfault.patch

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2012-01-31 Thread h_root

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory checked 
in at 2012-01-31 10:22:13

Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
 and  /work/SRC/openSUSE:Factory/.rrdtool.new (New)


Package is rrdtool, Maintainer is vci...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes  2011-09-23 
12:44:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2012-01-31 
10:22:19.0 +0100
@@ -1,0 +2,5 @@
+Mon Jan 30 19:28:22 CET 2012 - dmuel...@suse.de
+
+- require lua51-devel 
+
+---



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.mD7QWW/_old  2012-01-31 10:22:20.0 +0100
+++ /var/tmp/diff_new_pack.mD7QWW/_new  2012-01-31 10:22:20.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package rrdtool
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,27 +15,35 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:   rrdtool
-BuildRequires:  cairo-devel freetype2-devel glib2-devel intltool 
libart_lgpl-devel libpng-devel libxml2-devel pango-devel python-devel tcl-devel
+BuildRequires:  cairo-devel
+BuildRequires:  freetype2-devel
+BuildRequires:  glib2-devel
+BuildRequires:  intltool
+BuildRequires:  libart_lgpl-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  pango-devel
+BuildRequires:  python-devel
+BuildRequires:  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
+%if 0%{?suse_version} = 1120
+BuildRequires:  lua51-devel
+%else
 BuildRequires:  lua-devel
 %endif
-BuildRequires:  autoconf automake libtool
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 BuildRequires:  tcpd-devel
-License:GPL-2.0+
-Group:  Productivity/Scientific/Math
 Requires:   perl = %{perl_version}
 Version:1.4.5
-Release:8
+Release:0
 %define cgilib_version 0.7
 # http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
 Source: %{name}-%{version}.tar.bz2
@@ -48,6 +56,8 @@
 Url:http://oss.oetiker.ch/rrdtool/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Summary:A tool for data logging and analysis
+License:GPL-2.0+
+Group:  Productivity/Scientific/Math
 Requires:   dejavu
 
 %description
@@ -161,7 +171,6 @@
 #%{_datadir}/%{name}
 
 %package devel
-License:GPL-2.0+
 Summary:A tool for data logging and analysis - Development files
 Group:  Productivity/Scientific/Math
 Requires:   %name = %version
@@ -181,7 +190,6 @@
 %{_libdir}/pkgconfig/librrd.pc
 
 %package -n python-rrdtool
-License:GPL-2.0+
 Summary:Python bindings for rrdtool
 Group:  Productivity/Scientific/Math
 Requires:   %name = %version
@@ -199,10 +207,7 @@
 %defattr(-, root, root)
 %{py_sitedir}/*
 
-%if 0%{?has_lua}
-
 %package -n lua-rrdtool
-License:GPL-2.0+
 Summary:Lua bindings for rrdtool
 Group:  Productivity/Scientific/Math
 Requires:   %name = %version
@@ -221,10 +226,8 @@
 %dir %{_libdir}/lua/*
 %{_libdir}/lua/*/rrd.so
 %{_libdir}/lua/*/rrd.so.*
-%endif
 
 %package -n tcl-rrdtool
-License:GPL-2.0+
 Summary:Tcl bindings for rrdtool
 Group:  Productivity/Scientific/Math
 Requires:   tcl

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

2011-05-12 Thread h_root


Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory
checked in at Thu May 12 11:01:06 CEST 2011.




--- rrdtool/rrdtool.changes 2010-12-28 03:59:32.0 +0100
+++ /mounts/work_src_done/STABLE/rrdtool/rrdtool.changes2011-05-11 
13:52:40.0 +0200
@@ -1,0 +2,7 @@
+Wed May 11 11:48:32 UTC 2011 - m...@novell.com
+
+- Move the Tcl bindings into a separate subpackage.
+- Remove the superfluous call to (bnc#693085).
+- Adopt the current practice of packaging Tcl extensions.
+
+---

calling whatdependson for head-i586


New:

  rrdtool-tclversion.patch



Other differences:
--
++ rrdtool.spec ++
--- /var/tmp/diff_new_pack.v2lbJ8/_old  2011-05-12 10:59:51.0 +0200
+++ /var/tmp/diff_new_pack.v2lbJ8/_new  2011-05-12 10:59:51.0 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package rrdtool (Version 1.4.5)
+# spec file for package rrdtool
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -35,11 +35,12 @@
 Group:  Productivity/Scientific/Math
 Requires:   perl = %{perl_version}
 Version:1.4.5
-Release:1
+Release:6
 %define cgilib_version 0.7
 # http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
 Source: %{name}-%{version}.tar.bz2
 Patch1: rrdtool-lua_lib64.patch
+Patch2: rrdtool-tclversion.patch
 # 
http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
 Source1:cgilib-%{cgilib_version}.tar.bz2
 Patch11:cgilib-fix_automake.patch
@@ -59,6 +60,7 @@
 %if %{_lib}==lib64
 %patch1
 %endif
+%patch2
 pushd cgilib-%{cgilib_version}
 %patch11
 popd #cgilib
@@ -108,9 +110,7 @@
 ihtmldir=%{_docdir}/%{name}/html/ \
 examplesdir=%{_docdir}/%{name}/examples/ \
 libdir=%{_libdir} \
-pkglibdir=%_datadir/tcl/tclrrd%version \
-TCL_PACKAGE_DIR=%_datadir/tcl/tclrrd%version \
-TCL_PACKAGE_PATH=%_datadir/tcl \
+pkglibdir=%tcl_archdir/tclrrd%version \
 install
 # we install this later again
 rm -r $RPM_BUILD_ROOT%{_prefix}/lib/perl
@@ -134,11 +134,6 @@
 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
-# subdir of /usr/share/tcl
-mkdir -p $RPM_BUILD_ROOT/usr/share/tcl/tclrrd%{version}
-#mv $RPM_BUILD_ROOT/usr/lib/tclrrd%{version}/pkgIndex.tcl \
-#   $RPM_BUILD_ROOT/usr/share/tcl/tclrrd%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,10 +147,8 @@
 %doc %{_docdir}/rrdtool
 %doc %{_mandir}/*/*
 /usr/bin/*
-%{_datadir}/tcl
 %{_libdir}/librrd.so.*
 %{_libdir}/librrd_th.so.*
-%{_libdir}/tclrrd*.so
 %{perl_vendorlib}/RRDp.pm
 %{perl_vendorarch}/RRDs.pm
 #%{perl_vendorarch}/ntmake.pl
@@ -228,4 +221,23 @@
 %{_libdir}/lua/*/rrd.so.*
 %endif
 
+%package -n tcl-rrdtool
+License:GPLv2+
+Summary:Tcl bindings for rrdtool
+Group:  Productivity/Scientific/Math
+Requires:   tcl
+
+%description -n tcl-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 Tcl bindings
+
+%files -n tcl-rrdtool
+%defattr(-, root, root)
+%{tcl_archdir}/*
+%{_libdir}/tclrrd*.so
+
 %changelog

++ rrdtool-tclversion.patch ++
Index: bindings/tcl/tclrrd.c
===
--- bindings/tcl/tclrrd.c.orig
+++ bindings/tcl/tclrrd.c
@@ -678,10 +678,6 @@ static int init(
 if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL)
 return TCL_ERROR;
 
-if (Tcl_PkgRequire(interp, Tcl, TCL_VERSION, 1) == NULL) {
-return TCL_ERROR;
-}
-
 /*
  * Why a global array?  In keeping with the Rrd:: namespace, why
  * not simply create a normal variable Rrd::version and set it?





Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

commit rrdtool for openSUSE:Factory

28 matches

Site Navigation

Mail list logo

Footer information