Hello community,

here is the log from the commit of package netdata for openSUSE:Factory checked 
in at 2017-07-17 09:13:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netdata (Old)
 and      /work/SRC/openSUSE:Factory/.netdata.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "netdata"

Mon Jul 17 09:13:01 2017 rev:2 rq:510524 version:1.6.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/netdata/netdata.changes  2017-05-03 
15:56:30.006070790 +0200
+++ /work/SRC/openSUSE:Factory/.netdata.new/netdata.changes     2017-07-17 
09:13:01.496161042 +0200
@@ -1,0 +2,26 @@
+Sat Jul 15 21:49:52 UTC 2017 - plinn...@opensuse.org
+
+- mention patches added in last commit
+  * add netdata-automake-no-dist-xz.patch
+  * add netdata-logrotate-su.patch
+  * add netdata-smartd-log-path.patch
+
+-------------------------------------------------------------------
+Sun Jul  9 14:08:26 UTC 2017 - 9@cirno.systems
+
+- Adjust default smartd log path to openSUSE default
+
+-------------------------------------------------------------------
+Mon Jun 26 22:00:42 UTC 2017 - 9@cirno.systems
+
+- Update dependencies
+  * Enable more features
+  * Add soft dependencies
+- Build on all enabled SUSE flavors
+- Improve package description
+- Use upstream .service/init.d/logrotate files (virtually identical)
+- Fix permissions
+- Clean up %install section (more readable)
+- spec-cleaner
+
+-------------------------------------------------------------------

Old:
----
  netdata.init
  netdata.logrotate
  netdata.service

New:
----
  netdata-automake-no-dist-xz.patch
  netdata-logrotate-su.patch
  netdata-smartd-log-path.patch

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

Other differences:
------------------
++++++ netdata.spec ++++++
--- /var/tmp/diff_new_pack.dEiYOv/_old  2017-07-17 09:13:02.196062456 +0200
+++ /var/tmp/diff_new_pack.dEiYOv/_new  2017-07-17 09:13:02.200061891 +0200
@@ -15,68 +15,104 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+%define netdata_user    netdata
+%define netdata_group   netdata
 %if 0%{?suse_version} > 1220
 %bcond_without systemd
 %else
 %bcond_with    systemd
 %endif
-
-%define netdata_user    netdata
-%define netdata_group   netdata
 Name:           netdata
 Version:        1.6.0
-Release:        1
-Summary:        Real-time performance monitoring
+Release:        0
+Summary:        A system for distributed real-time performance and health 
monitoring
 # netdata is GPL-3.0+ other licenses refer to included third-party software 
(see LICENSE.md)
-License:        GPL-3.0+ and MIT and BSD-2-Clause and BSD-3-Clause and 
LGPL-2.1 and OFL-1.1 and CC0-1.0
+License:        GPL-3.0+ AND MIT AND BSD-2-Clause AND BSD-3-Clause AND 
LGPL-2.1 AND OFL-1.1 AND CC0-1.0
 Group:          System/Monitoring
 Url:            http://my-netdata.io/
 Source0:        
https://github.com/firehol/netdata/releases/download/v%{version}/netdata-%{version}.tar.gz
-Source1:        netdata.service
-Source2:        netdata.init
-Source3:        netdata.logrotate
-Source4:        netdata-rpmlintrc
+Source1:        netdata-rpmlintrc
+Patch0:         netdata-logrotate-su.patch
+Patch1:         netdata-automake-no-dist-xz.patch
+Patch2:         netdata-smartd-log-path.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
-BuildRequires:  libmnl-devel
+%if 0%{?suse_version} > 1140
+%ifarch i586 x86_64
+BuildRequires:  freeipmi-devel
+%endif
+%endif
+
+%if 0%{?sle_version} >= 130000
 BuildRequires:  libnetfilter_acct-devel
+%endif
+
+BuildRequires:  libcap-devel
+BuildRequires:  libmnl-devel
 BuildRequires:  libuuid-devel
+BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(pre): shadow
+Recommends:     PyYAML
+Recommends:     curl
+Recommends:     iproute-tc
+Recommends:     lm_sensors
+Recommends:     nmap-ncat
+Recommends:     python
+Recommends:     python2-PyMySQL
+Recommends:     python2-psycopg2
+Suggests:       logrotate
+Suggests:       nodejs
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-netdata is a highly optimized Linux daemon providing real-time performance 
monitoring for Linux systems, Applications, SNMP devices, over the web!
+netdata is a system for distributed real-time performance and health 
monitoring.
+It provides insights, in real-time, of everything happening on the system it
+runs on (including applications such as web and database servers),
+using interactive web dashboards.
 
 %prep
 %setup -q
+%patch0
+%patch1 -p1
+%patch2 -p1
 dos2unix web/lib/tableExport-1.6.0.min.js
 
 %build
 autoreconf -fi
 %configure \
        --docdir="%{_docdir}/%{name}-%{version}" \
+%if 0%{?sle_version} >= 130000
        --enable-plugin-nfacct \
+%endif
        --with-zlib \
        --with-math \
-       --with-user=netdata \
+       --with-user=%{netdata_user} \
        %{?conf}
 make %{?_smp_mflags}
 
 %install
 %make_install
 find %{buildroot} -name .keep -delete
-%fdupes -s %{buildroot}
+install -D -m 0644 system/%{name}.logrotate 
%{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -D -m 0644 system/%{name}.conf 
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+
 %if %{with systemd}
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+install -D -m 0644 system/%{name}.service 
%{buildroot}%{_unitdir}/%{name}.service
 ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %else
-install -D -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/%{name}
+%if 0%{?sle_version} >= 120000
+install -D -m 0755 system/%{name}-init-d 
%{buildroot}%{_sysconfdir}/init.d/%{name}
+%else
+install -D -m 0755 system/%{name}-lsb %{buildroot}%{_sysconfdir}/init.d/%{name}
+%endif
 ln -s -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
 %endif
-install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
+%fdupes -s %{buildroot}
 
 %pre
 getent group %{netdata_group} >/dev/null || \
@@ -114,25 +150,38 @@
 %files
 %defattr(-,root,root)
 %doc ChangeLog COPYING LICENSE.md README.md
-%attr(750, %{netdata_user},root ) %dir %{_localstatedir}/cache/%{name}/
-%attr(750, %{netdata_user},root ) %dir %{_localstatedir}/log/%{name}/
-%attr(750, root,%{netdata_group} ) %dir %{_sysconfdir}/%{name}/
-%attr(755, root,%{netdata_group} ) %dir %{_datadir}/%{name}
-%attr(755, root,%{netdata_group} ) %dir %{_datadir}/%{name}/*
-%attr(755, root,%{netdata_group} ) %dir %{_datadir}/%{name}/web/*
-%attr(644, root,%{netdata_group} ) %{_datadir}/%{name}/web/*
-%attr(644, root,%{netdata_group} ) %{_datadir}/%{name}/web/*/*
-%config(noreplace) %{_sysconfdir}/%{name}/*
+
+%dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/charts.d
+%dir %{_sysconfdir}/%{name}/node.d
+%config(noreplace) %{_sysconfdir}/%{name}/*.conf
+%config(noreplace) %{_sysconfdir}/%{name}/charts.d/*.conf
+%config(noreplace) %{_sysconfdir}/%{name}/health.d/*.conf
+%config(noreplace) %{_sysconfdir}/%{name}/python.d/*.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+
+%{_sysconfdir}/%{name}/node.d/*.md
+
+%{_libexecdir}/%{name}
+
 %{_sbindir}/%{name}
 %{_sbindir}/rc%{name}
-%{_datadir}/%{name}/
-%{_libexecdir}/%{name}/
+
+%attr(0750,%{netdata_user},root) %dir %{_localstatedir}/cache/%{name}
+%attr(0750,%{netdata_user},root) %dir %{_localstatedir}/log/%{name}
+%attr(0750,%{netdata_user},root) %dir %{_localstatedir}/lib/%{name}
+
+%attr(-,root,%{netdata_group}) %dir %{_datadir}/%{name}
+%dir %{_sysconfdir}/%{name}/health.d
+%dir %{_sysconfdir}/%{name}/python.d
+
 %if %{with systemd}
 %{_unitdir}/%{name}.service
 %else
 %{_sysconfdir}/init.d/%{name}
 %endif
-%{_datadir}/%{name}/
+
+%defattr(0644,root,%{netdata_group},0755)
+%{_datadir}/%{name}/web
 
 %changelog

++++++ netdata-automake-no-dist-xz.patch ++++++
diff -u netdata-1.6.0.orig/Makefile.am netdata-1.6.0/Makefile.am
--- netdata-1.6.0.orig/Makefile.am      2017-03-20 19:32:47.000000000 +0100
+++ netdata-1.6.0/Makefile.am   2017-06-25 23:46:14.403426661 +0200
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2015 Alon Bar-Lev <alon.bar...@gmail.com>
 #
-AUTOMAKE_OPTIONS=foreign dist-bzip2 dist-xz 1.10
+AUTOMAKE_OPTIONS=foreign dist-bzip2 1.10
 ACLOCAL_AMFLAGS = -I m4
 
 MAINTAINERCLEANFILES= \
++++++ netdata-logrotate-su.patch ++++++
--- system/netdata.logrotate.in.orig    2017-01-23 20:49:04.000000000 +0100
+++ system/netdata.logrotate.in 2017-02-02 12:17:57.110168995 +0100
@@ -1,4 +1,5 @@
 @localstatedir_POST@/log/netdata/*.log {
+       su netdata netdata
        daily
        missingok
        rotate 14
++++++ netdata-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.dEiYOv/_old  2017-07-17 09:13:02.252054569 +0200
+++ /var/tmp/diff_new_pack.dEiYOv/_new  2017-07-17 09:13:02.252054569 +0200
@@ -1,2 +1,2 @@
 addFilter("script-without-shebang")
-
+addFilter("non-conffile-in-etc /etc/netdata/node.d/.*.md")

++++++ netdata-smartd-log-path.patch ++++++
diff -ru netdata-1.6.0.orig/conf.d/python.d/smartd_log.conf 
netdata-1.6.0/conf.d/python.d/smartd_log.conf
--- netdata-1.6.0.orig/conf.d/python.d/smartd_log.conf  2017-03-20 
19:32:47.000000000 +0100
+++ netdata-1.6.0/conf.d/python.d/smartd_log.conf       2017-07-09 
16:05:47.572576749 +0200
@@ -82,4 +82,4 @@
 #
 # JOB configuration
 # 
-log_path: '/var/log/smartd'
+log_path: '/var/lib/smartmontools'

Reply via email to