From df269f93182fd085d0c46a5fed2e6b65c2c5683c9a68e3f5a589eaf8a2cabbdf Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Wed, 5 Jul 2017 05:24:33 +0000 Subject: [PATCH] Accepting request 508000 from home:scarabeus_iv:branches:devel:languages:python - 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 - 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 OBS-URL: https://build.opensuse.org/request/show/508000 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=75 --- rrdtool-1.6.0.tar.gz | 3 -- rrdtool-1.7.0.tar.gz | 3 ++ rrdtool.changes | 16 +++++++++ rrdtool.spec | 80 +++++++++++++++++++------------------------- 4 files changed, 53 insertions(+), 49 deletions(-) delete mode 100644 rrdtool-1.6.0.tar.gz create mode 100644 rrdtool-1.7.0.tar.gz diff --git a/rrdtool-1.6.0.tar.gz b/rrdtool-1.6.0.tar.gz deleted file mode 100644 index 52231d0..0000000 --- a/rrdtool-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 -size 2186538 diff --git a/rrdtool-1.7.0.tar.gz b/rrdtool-1.7.0.tar.gz new file mode 100644 index 0000000..3bda6d2 --- /dev/null +++ b/rrdtool-1.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b +size 2849994 diff --git a/rrdtool.changes b/rrdtool.changes index 809c6ae..37ae2ab 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jul 3 11:22:55 UTC 2017 - tchvatal@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 - tchvatal@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 + ------------------------------------------------------------------- Tue Dec 6 12:59:16 UTC 2016 - jengelh@inai.de diff --git a/rrdtool.spec b/rrdtool.spec index 9de3b1a..2ede24d 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -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 @@ Source99: %{name}.changes 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: openssl-devel 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: tcpd-devel 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 @@ enforce a certain data density. It can be used either via simple wrapper 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 @@ display time-series data (i.e. network bandwidth, machine-room temperature, 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 @@ server load average). This package contains documentation on using RRD. 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 @@ This package contains the Lua bindings. %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: python %description -n python-%{name} Python RRDtool bindings. @@ -155,7 +158,6 @@ Python RRDtool bindings. %package -n ruby-%{name} Summary: Ruby bindings for RRDtool Group: Development/Languages/Ruby -BuildRequires: ruby-devel Requires: %{name} = %{version}-%{release} Requires: ruby(abi) >= %{rb_ver} @@ -171,7 +173,6 @@ This package contains the Ruby bindings. %package -n tcl-%{name} Summary: Tcl bindings for RRDtool Group: Development/Languages/Tcl -BuildRequires: tcl-devel >= 8.0 Requires: %{name} = %{version}-%{release} Requires: tcl >= 8.0 @@ -189,9 +190,8 @@ This package contains the Tcl bindings. Summary: Data caching daemon for RRDtool Group: Productivity/Scientific/Math Requires: %{name} = %{version}-%{release} -Requires(pre): %fillup_prereq -Requires(pre): /usr/sbin/useradd -Requires(pre): /usr/sbin/groupadd +Requires(post): %fillup_prereq +Requires(pre): shadow %description cached rrdcached is a daemon that receives updates to existing RRD files, @@ -200,7 +200,6 @@ passed, writes the updates to the RRD file. The daemon was written with big setups in mind which usually runs into I/O related problems. This daemon was written to alleviate these problems. - %prep %setup -q %patch3 @@ -213,7 +212,11 @@ TIME="\"$(date -d "${modified}" "+%%R")\"" find . -name '*.c' -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" "{}" "+" %build +# --disable-nls: there is only partial hungarian translation, does not make %{?_smp_mflags} +# much sense to ship package for it %configure \ + --disable-nls \ + --disable-silent-rules \ --enable-shared \ --disable-static\ --disable-rpath \ @@ -254,7 +257,7 @@ make %{?_smp_mflags} %install make \ - DESTDIR="%{buildroot}" \ + DESTDIR=%{buildroot} \ idocdir=%{_docdir}/%{name}/txt/ \ ihtmldir=%{_docdir}/%{name}/html/ \ examplesdir=%{_docdir}/%{name}/examples/ \ @@ -268,19 +271,15 @@ make \ %if %{with lua} # install ruby bindings manually -mv %{buildroot}/usr/local/lib/lua %{buildroot}%{_libdir}/lua +mv %{buildroot}%{_prefix}/local/lib/lua %{buildroot}%{_libdir}/lua %endif %if %{with ruby} -# install ruby bindings manually -%if 0%{?suse_version} == 1310 -rm -r %{buildroot}%{rb_sitearchdir}/* -%endif install -D bindings/ruby/RRD.so %{buildroot}%{rb_sitearchdir}/RRD.so %endif # remove cruft -find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print +find %{buildroot} -type f -name "*.la" -delete -print # documentation rm %{buildroot}%{_docdir}/%{name}/txt/*.pod @@ -299,6 +298,9 @@ chmod 644 %{buildroot}%{_tmpfilesdir}/rrdcached.conf mkdir -p %{buildroot}%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrrdcached +%check +make %{?_smp_mflags} check + %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} @@ -307,11 +309,7 @@ getent passwd %{rrdcached_user} >/dev/null || useradd -s /sbin/nologin -g %{rrdc %post cached %fillup_only rrdcached %service_add_post rrdcached.servicet rrdcached.socket -%if 0%{?suse_version} <= 1320 -systemd-tmpfiles --create %{_tmpfilesdir}/rddcached.conf >/dev/null 2>&1 || : -%else %tmpfiles_create %{_tmpfilesdir}/rddcached.conf -%endif %preun cached %service_del_preun rrdcached.service rrdcached.socket @@ -323,7 +321,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/rddcached.conf >/dev/null 2>&1 || : %postun -n librrd8 -p /sbin/ldconfig %files -%defattr(-,root,root,-) %exclude %{_docdir}/%{name} %{_mandir}/*/* %exclude %{_mandir}/man1/rrdcached* @@ -332,23 +329,19 @@ systemd-tmpfiles --create %{_tmpfilesdir}/rddcached.conf >/dev/null 2>&1 || : %exclude %{_bindir}/rrdcached %files -n librrd8 -%defattr(-,root,root) %{_libdir}/librrd.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/*.h %{_libdir}/librrd.so %{_libdir}/pkgconfig/librrd.pc %files doc -%defattr(-,root,root,-) %doc CONTRIBUTORS COPYRIGHT NEWS THREADS TODO %doc %{_docdir}/rrdtool %exclude %{_docdir}/rrdtool/html/RRD*.html %files -n perl-%{name} -%defattr(-,root,root,-) %doc %{_docdir}/rrdtool/html/RRD*.html %{_mandir}/man3/RRD* %{perl_vendorlib}/RRDp.pm @@ -357,7 +350,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/rddcached.conf >/dev/null 2>&1 || : %if %{with lua} %files -n lua-%{name} -%defattr(-,root,root,-) %doc bindings/lua/README %dir %{_libdir}/lua %dir %{_libdir}/lua/* @@ -367,28 +359,24 @@ systemd-tmpfiles --create %{_tmpfilesdir}/rddcached.conf >/dev/null 2>&1 || : %if %{with python} %files -n python-%{name} -%defattr(-,root,root,-) -%doc bindings/python/AUTHORS bindings/python/COPYING bindings/python/README +%doc bindings/python/COPYING bindings/python/README.md %{py_sitedir}/* %endif %if %{with ruby} %files -n ruby-%{name} -%defattr(-,root,root,-) %doc bindings/ruby/README %{rb_sitearchdir}/RRD.so %endif %if %{with tcl} %files -n tcl-%{name} -%defattr(-,root,root,-) %doc bindings/tcl/README %{tcl_archdir}/* %{_libdir}/tclrrd*.so %endif %files cached -%defattr(-,root,root,-) %{_mandir}/man1/rrdcached* %{_bindir}/rrdcached %{_sbindir}/rcrrdcached