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.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes     2015-11-24 
22:30:58.000000000 +0100
@@ -1,0 +2,143 @@
+Wed Sep 23 07:55:35 UTC 2015 - [email protected]
+
+- 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
+    excluded from having an effect on the scaling of the graph
+  * TRENDNAN is now working properly and als not crashing anymore
+  * Added a no-op string positioning combo "\." this allows to write
+    COMMENT:OS\2\. which would otherwise not be possible.
+  * JSON output of xport is now actually json compilant by its keys
+    being properly quoted now.
+  * The label positioner in rrd_graph is now properly ignoring the current
+    state of DST.
+  * fixes and enhancements for Python, Ruby, TCL and Perl bindings
+  * improved error reporting in rrd_graph
+  * portability and cross compilation
+  * code and bugtracker moved to https://github.com/oetiker/rrdtool-1.x
+
+- Dropped patches (included upstream):
+  - rrdtool-1.4.7-CVE-2013-2131-imginfo_format_check.patch
+
+- Dropped patches (resolved otherwise):
+  - rrdtool-lua-ruby_lib64.patch
+  - rrdtool-tclversion.patch
+
+- Dropped cgilib-0.7.tar.gz + cgilib-fix_automake.patch (no
+  references to cgilib or cgi.h found, so benefit unclear)
+
+- Spec cleanup
+  + Added new perl-rrdtool subpackage containing the perl bindings
+  + Added new -doc subpackge
+  * bcond_without for lua, python, ruby and tcl
+  * bcond_without for libdbi, libwrap (tcpd)
+  * bcond_with for rados (ceph)
+  - Dropped BuildRequires: autoconf + automake (was needed for cgilib)
+  - Dropped BuildRequires: libart_lgpl-devel (replaced by cairo/pango
+    in earlier releases)
+
+-------------------------------------------------------------------

Old:
----
  cgilib-0.7.tar.gz
  cgilib-fix_automake.patch
  rrdtool-1.4.7-CVE-2013-2131-imginfo_format_check.patch
  rrdtool-1.4.7.tar.gz
  rrdtool-lua-ruby_lib64.patch
  rrdtool-tclversion.patch

New:
----
  rrdtool-1.5.4.tar.gz

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

Other differences:
------------------
++++++ rrdtool.spec ++++++
--- /var/tmp/diff_new_pack.3IdmmY/_old  2015-11-24 22:30:59.000000000 +0100
+++ /var/tmp/diff_new_pack.3IdmmY/_new  2015-11-24 22:30:59.000000000 +0100
@@ -16,131 +16,173 @@
 #
 
 
-%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
+%bcond_without  lua
+%bcond_without  python
+%bcond_without  ruby
+%bcond_without  tcl
+
+%bcond_without  libdbi
+%bcond_without  libwrap
+%bcond_with     rados
 
 Name:           rrdtool
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  cairo-devel
+Version:        1.5.4
+Release:        0
+Summary:        Round Robin Database Tool to store and display time-series data
+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
+Source2:        sysconfig.rrdcached
+Source4:        rrdcached-systemd-pre
+Source5:        rrdcached.service
+Source99:       %{name}.changes
+# PATCH-FIX-UPSTREAM -- Prevent possible segfault
+Patch3:         rrdtool-tclsegfault.patch
+# PATCH-FIX-UPSTREAM -- bnc#793636
+Patch12:        rrdtool-zero_vs_nothing.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  cairo-devel >= 1.2
 BuildRequires:  freetype2-devel
+BuildRequires:  gcc-c++
 BuildRequires:  gettext-tools
 BuildRequires:  glib2-devel
 BuildRequires:  groff
-BuildRequires:  intltool
-BuildRequires:  libart_lgpl-devel
+BuildRequires:  intltool >= 0.35.0
 BuildRequires:  libpng-devel
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
-BuildRequires:  lua51-devel
-BuildRequires:  pango-devel
-BuildRequires:  python-devel
-BuildRequires:  ruby-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pango-devel >= 1.14
 BuildRequires:  systemd-rpm-macros
-BuildRequires:  tcl-devel
+BuildRequires:  zlib-devel
+
+%if %{with libdbi}
+BuildRequires:  libdbi-devel
+%endif
+%if %{with libwrap}
 BuildRequires:  tcpd-devel
-Requires:       perl = %{perl_version}
-Version:        1.4.7
-Release:        0
-%define cgilib_version 0.7
-Source:         http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
-Patch1:         rrdtool-lua-ruby_lib64.patch
-Patch2:         rrdtool-tclversion.patch
-Patch3:         rrdtool-tclsegfault.patch
-# PATCH-FIX-UPSTREAM bnc#828003 [email protected] -- 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
-Patch12:        rrdtool-zero_vs_nothing.patch
-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+
-Group:          Productivity/Scientific/Math
+%endif
+%if %{with rados}
+BuildRequires:  librados2-devel
+%endif
+
 Requires:       dejavu
-Requires(pre):  pwdutils
 
 %description
-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.
+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). It stores the data in a very compact way that will not
+expand over time, and it presents useful graphs by processing the data to
+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 devel
-Summary:        A tool for data logging and analysis - Development files
+Summary:        RRDtool libraries and header files
 Group:          Development/Libraries/C and C++
-Requires:       %name = %version
+Requires:       %{name} = %{version}-%{release}
 
 %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.
+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 allow you to use directly this library.
 
-%package -n python-rrdtool
-Summary:        Python bindings for rrdtool
-Group:          Development/Languages/Python
-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.
+%package doc
+Summary:        RRDtool documentation
+Group:          Documentation
+
+%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.
+
 
-This package contains the Python bindings
+%package -n perl-%{name}
+Summary:        Perl bindings for RRDtool
+Group:          Development/Languages/Perl
+Requires:       %{name} = %{version}-%{release}
+Requires:       perl = %{perl_version}
+
+%description -n perl-%{name}
+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.
 
+This package contains the Perl bindings.
 
-%package -n lua-rrdtool
-Summary:        Lua bindings for rrdtool
+
+%if %{with lua}
+%package -n lua-%{name}
+Summary:        Lua bindings for RRDtool
 Group:          Development/Languages/Other
-Requires:       %name = %version
+BuildRequires:  lua51-devel
+Requires:       %{name} = %{version}-%{release}
+Requires:       lua
 
-%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.
+%description -n lua-%{name}
+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.
+
+This package contains the Lua bindings.
+%endif
+
+%if %{with python}
+%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}
 
-This package contains the Lua bindings
+%description -n python-%{name}
+Python RRDtool bindings.
+%endif
 
-%package -n ruby-rrdtool
-Summary:        Ruby bindings for rrdtool
+%if %{with ruby}
+%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}
 
-%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.
+%description -n ruby-%{name}
+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.
 
-This package contains the Ruby bindings
+This package contains the Ruby bindings.
+%endif
 
-%package -n tcl-rrdtool
-Summary:        Tcl bindings for rrdtool
+%if %{with tcl}
+%package -n tcl-%{name}
+Summary:        Tcl bindings for RRDtool
 Group:          Development/Languages/Tcl
-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.
+BuildRequires:  tcl-devel >= 8.0
+Requires:       %{name} = %{version}-%{release}
+Requires:       tcl >= 8.0
+
+%description -n tcl-%{name}
+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.
 
-This package contains the Tcl bindings
+This package contains the Tcl bindings.
+%endif
 
 %package cached
+%define         rrdcached_user  rrdcached
+%define         rrdcached_group rrdcached
 Summary:        Data caching daemon for RRDtool
 Group:          Productivity/Scientific/Math
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 Requires(pre):  %fillup_prereq
-%define         rrdcached_user rrdcached
-%define         rrdcached_group rrdcached
+Requires(pre):  pwdutils
 
 %description cached
 rrdcached is a daemon that receives updates to existing RRD files,
@@ -149,186 +191,211 @@
 big setups in mind which usually runs into I/O related problems.  This
 daemon was written to alleviate these problems.
 
+
 %prep
-%setup -q -a1
-%if %{_lib}==lib64
-%patch1
-%endif
-%patch2
+%setup -q
 %patch3
-%patch4 -p1
-pushd "cgilib-%{cgilib_version}"
-%patch11
-popd #cgilib
 %patch12 -p1
+
+# rrd_tool/rrd_cgi: use the date of the last change
 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"
+find . -name '*.c' -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} 
\;
 
 %build
-# first prepare cgilib
-pushd cgilib-%{cgilib_version}
-echo -n > NEWS
-aclocal --force
-autoreconf -fiv
-CGILIB_CFLAGS="%{optflags} -fPIC -I."
-CGILIB_CFLAGS="$CGILIB_CFLAGS -fexcess-precision=fast"
-CFLAGS="$CGILIB_CFLAGS" \
-%configure
-make %{?jobs:-j %jobs}
-%__mkdir_p ../lb/include
-%__cp *.h ../lb/include/
-%__mkdir_p ../lb/lib/
-%__cp -a .libs/libcgi.so* ../lb/lib/
-popd #cgilib
-
-# build rrdtool
-if [ ! -d m4 ]; then mkdir m4; fi
-# we need getext 0.18
-#autoreconf -i -f
-export LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \
-%configure --disable-static --with-pic --enable-shared \
-           --enable-tcl-site \
-            --with-tcllib=%{_libdir} \
-            --with-gnu-ld \
+%configure \
+        --enable-shared \
+        --disable-static\
+        --disable-rpath \
+%if %{with lua}
+        --enable-lua \
+        --enable-lua-site-install \
+%else
+        --disable-lua \
+%endif
+        --enable-perl \
+        --enable-perl-site-install \
+        --with-perl-options='INSTALLDIRS="vendor"' \
+%if %{with python}
            --enable-python \
+%else
+        --disable-python \
+%endif
+%if %{with ruby}
            --enable-ruby \
            --enable-ruby-site-install \
-            --disable-rpath \
-            --with-rrd-default-font="monospace" 
-make %{?jobs:-j %jobs} V=1
+        --with-ruby-options='sitedir="%{rb_sitearchdir}"' \
+%else
+        --disable-ruby \
+%endif
+%if %{with tcl}
+        --enable-tcl \
+        --enable-tcl-site \
+        --with-tcllib=%{_libdir} \
+%else
+        --disable-tcl \
+%endif
+        --with-rrd-default-font="monospace" \
+        --with-pic \
+        --with-gnu-ld \
+        --with-systemdsystemunitdir=%{_unitdir}
+
+make %{?_smp_mflags}
 
 %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 \
+        DESTDIR="%{buildroot}" \
     idocdir=%{_docdir}/%{name}/txt/ \
     ihtmldir=%{_docdir}/%{name}/html/ \
     examplesdir=%{_docdir}/%{name}/examples/ \
     libdir=%{_libdir} \
-    pkglibdir=%tcl_archdir/tclrrd%version \
+%if %{with tcl}
+        pkglibdir=%{tcl_archdir}/tclrrd%{version} \
+%endif
     install
-# we install this later again
-rm -r $RPM_BUILD_ROOT%{_prefix}/lib/perl
-# do not install fonts (use system fonts instead)
-rm -rf $RPM_BUILD_ROOT%_datadir/rrdtool/fonts
-# install correctly perl modules
-pushd bindings/perl-piped 
-perl Makefile.PL
-make DESTDIR=$RPM_BUILD_ROOT install_vendor
-popd
-pushd bindings/perl-shared 
-perl Makefile.PL
-make DESTDIR=$RPM_BUILD_ROOT install_vendor
-popd
+
 %perl_process_packlist
-#fix build (it would be better to split cgilib)
-#sed 
's/[[:space:]]*-L\/usr\/src\/packages\/BUILD\/%{name}-%{version}\/lb\/lib[[:space:]]*/
 /' $RPM_BUILD_ROOT/%{_libdir}/librrd.la > tmp
-#mv tmp $RPM_BUILD_ROOT/%{_libdir}/librrd.la
-#sed 
's/[[:space:]]*-L\/usr\/src\/packages\/BUILD\/%{name}-%{version}\/lb\/lib[[:space:]]*/
 /' $RPM_BUILD_ROOT/%{_libdir}/librrd_th.la > tmp
-#mv tmp $RPM_BUILD_ROOT/%{_libdir}/librrd_th.la
-find "%{buildroot}" -type f -name '*.la' -exec %__rm {} \;
-# install ruby bindings
-pushd bindings/ruby
-mkdir -p %{buildroot}/%{rb_sitearchdir}
-make DESTDIR=%{buildroot} install
-popd
+
+%if %{with lua}
+# install ruby bindings manually
+mv %{buildroot}/usr/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
+
 # documentation
-install -m 644 CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO 
$RPM_BUILD_ROOT/%{_docdir}/%{name}
-pushd doc
-mkdir txt
-mkdir html
-mv *.txt txt/
-mv *.html html/
-popd
-rm examples/rrdcached/Makefile*
-chmod -x examples/*
-chmod +x examples/rrdcached
+rm %{buildroot}%{_docdir}/%{name}/txt/*.pod
+find %{buildroot}%{_docdir}/%{name}/examples/ -type f -exec chmod 0644 {} \;
+
 # install rrdcached specials
-install -Dm644 %{SOURCE2} 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.rrdcached
+install -D -m 644 %{SOURCE2} 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.rrdcached
+
 # install systemd specific files
-install -Dm755 %{SOURCE4} 
%{buildroot}%{_datadir}/rrdcached/rrdcached-systemd-pre
-install -Dm644 %{SOURCE5} %{buildroot}%{_unitdir}/rrdcached.service
-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
+install -D -m 0755 %{SOURCE4} 
%{buildroot}%{_datadir}/rrdcached/rrdcached-systemd-pre
+install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/rrdcached.service
+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
+
+mkdir -p %{buildroot}%{_sbindir}
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrrdcached
+
+%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} || :
+%service_add_pre rrdcached.service
+%service_add_pre rrdcached.socket
+
+%post cached
+%fillup_only rrdcached
+%service_add_post rrdcached.service
+%service_add_post 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
+%service_del_preun rrdcached.socket
+
+%postun cached
+%service_del_postun rrdcached.service
+%service_del_postun rrdcached.socket
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
-%doc %{_docdir}/rrdtool
-%doc %{_mandir}/*/*
+%defattr(-,root,root,-)
+%exclude %{_docdir}/%{name}
+%{_mandir}/*/*
+%exclude %{_mandir}/man1/rrdcached*
+%exclude %{_mandir}/man3/RRD*
 %{_bindir}/*
 %exclude %{_bindir}/rrdcached
 %{_libdir}/librrd.so.*
 %{_libdir}/librrd_th.so.*
-%{perl_vendorlib}/RRDp.pm
-%{perl_vendorarch}/RRDs.pm
-#%{perl_vendorarch}/ntmake.pl
-%{perl_vendorarch}/auto/*
-#%{_datadir}/%{name}
 
 %files devel
-%defattr(-, root, root)
-%{_includedir}/*
+%defattr(-,root,root,-)
+%{_includedir}/*.h
 %{_libdir}/librrd_th.so
 %{_libdir}/librrd.so
 %{_libdir}/pkgconfig/librrd.pc
 
-%files -n python-rrdtool
-%defattr(-, root, root)
-%{py_sitedir}/*
+%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
+%{perl_vendorarch}/RRDs.pm
+%{perl_vendorarch}/auto/*
 
-%files -n lua-rrdtool
-%defattr(-, root, root)
+%if %{with lua}
+%files -n lua-%{name}
+%defattr(-,root,root,-)
+%doc bindings/lua/README
 %dir %{_libdir}/lua
 %dir %{_libdir}/lua/*
 %{_libdir}/lua/*/rrd.so
 %{_libdir}/lua/*/rrd.so.*
+%endif
 
-%files -n tcl-rrdtool
-%defattr(-, root, root)
-%{tcl_archdir}/*
-%{_libdir}/tclrrd*.so
-
-#%{!?rb_sitearchdir: %define rb_sitearchdir %(ruby -rrbconfig -e 'puts 
RbConfig::CONFIG["sitearchdir"]')}
+%if %{with python}
+%files -n python-%{name}
+%defattr(-,root,root,-)
+%doc bindings/python/AUTHORS bindings/python/COPYING bindings/python/README
+%{py_sitedir}/*
+%endif
 
-%files -n ruby-rrdtool
-%defattr(-, root, root)
+%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)
+%defattr(-,root,root,-)
+%{_mandir}/man1/rrdcached*
 %{_bindir}/rrdcached
+%{_sbindir}/rcrrdcached
 %{_localstatedir}/adm/fillup-templates/sysconfig.rrdcached
 %{_datadir}/rrdcached
 %{_datadir}/rrdcached/rrdcached-systemd-pre
 %{_unitdir}/rrdcached.service
+%{_unitdir}/rrdcached.socket
 %if 0%{?suse_version} <= 1320
-%dir %_prefix/lib/tmpfiles.d
+%dir %{_libexecdir}/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 || 
:
-%service_add_pre rrdcached.service
-
-%post cached
-%service_add_post rrdcached.service
-%fillup_only rrdcached
-systemd-tmpfiles --create %{_tmpfilesdir}/rrdcached.conf || :
-
-%preun cached
-%service_del_preun rrdcached.service
-
-%postun cached
-%service_del_postun rrdcached.service
+%ghost /run/rrdcached
 
 %changelog

++++++ rrdtool-1.4.7.tar.gz -> rrdtool-1.5.4.tar.gz ++++++
++++ 149780 lines of diff (skipped)


Reply via email to