X-Git-Url: https://git.tld-linux.org/?p=packages%2Frrdtool.git;a=blobdiff_plain;f=rrdtool.spec;h=caeb8c89544948b4a1727ab50077d634e9c83b0d;hp=7f75875ecf4d221df148dc3ac1dd3389a3bc9161;hb=HEAD;hpb=2ab8f4b05e90221887abe1518c9c49d93bb88b72

diff --git a/rrdtool.spec b/rrdtool.spec
index 7f75875..03526dc 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -27,15 +27,16 @@ Summary(pt_BR.UTF-8):	Round Robin Database, uma ferramenta para construção de
 Summary(ru.UTF-8):	RRDtool - база данных с "циклическим обновлением"
 Summary(uk.UTF-8):	RRDtool - це система зберігання та показу серійних даних
 Name:		rrdtool
-Version:	1.7.2
-Release:	7
+Version:	1.8.0
+Release:	3
 License:	GPL v2+ + FLOSS exception
 Group:		Applications/Databases
-Source0:	https://oss.oetiker.ch/rrdtool/pub/%{name}-%{version}.tar.gz
-# Source0-md5:	638e3a0a1609d97e9f82e8832759dcd2
+Source0:	https://github.com/oetiker/rrdtool-1.x/releases/download/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	852754364cbd0703a099b5eb32932851
+Source1:	rrdcached.init
+Source2:	rrdcached.sysconfig
 Patch0:		%{name}-tcl-path.patch
-Patch1:		%{name}-missing.patch
-Patch2:		groff.patch
+Patch1:		groff.patch
 URL:		http://oss.oetiker.ch/rrdtool/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -313,7 +314,6 @@ Rozszerzenie Tcl-a pozwalające na dostęp do biblioteki Tcl.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e 's#\$TCL_PACKAGE_PATH#%{_prefix}/lib#g' configure.ac
 %{__sed} -i -e 's#/lib/lua/#/%{_lib}/lua/#g' configure.ac
@@ -359,7 +359,7 @@ install -d perl-docs/html
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_examplesdir}/%{name}-%{version}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -368,6 +368,9 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 	examplesdir=%{_examplesdir}/%{name}-%{version} \
 	RUBYARCHDIR=$RPM_BUILD_ROOT%{ruby_archdir}
 
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/rrdcached
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rrdcached
+
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/librrd.la
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}
 
@@ -385,6 +388,26 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%pre cached
+%groupadd -g 347 rrdcached
+%useradd -u 347 -d /usr/share/empty -g rrdcached -c "rrdcached daemon user" rrdcached
+
+%post cached
+/sbin/chkconfig --add rrdcached
+%service rrdcached restart
+
+%postun cached
+if [ "$1" = "0" ]; then
+	%userremove rrdcached
+	%groupremove rrdcached
+fi
+
+%preun cached
+if [ "$1" = "0" ]; then
+	%service rrdcached stop
+	/sbin/chkconfig --del rrdcached
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc CHANGES CONTRIBUTORS COPYRIGHT NEWS THREADS TODO
@@ -412,8 +435,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/rrdlastupdate.1*
 %{_mandir}/man1/rrdlist.1*
 %{?with_ceph:%{_mandir}/man1/rrdrados.1*}
+%{?with_python:%{_mandir}/man1/rrdpython.1*}
 %{_mandir}/man1/rrdresize.1*
 %{_mandir}/man1/rrdrestore.1*
+%{?with_ruby:%{_mandir}/man1/rrdruby.1*}
 %{_mandir}/man1/rrdthreads.1*
 %{_mandir}/man1/rrdtool.1*
 %{_mandir}/man1/rrdtune.1*
@@ -424,12 +449,16 @@ rm -rf $RPM_BUILD_ROOT
 %files cached
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rrdcached
+%attr(754,root,root) /etc/rc.d/init.d/rrdcached
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rrdcached
 %{_mandir}/man1/rrdcached.1*
 %{_mandir}/man1/rrdflushcached.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librrd.so
+%attr(754,root,root) /etc/rc.d/init.d/rrdcached
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rrdcached
 %{_includedir}/rrd*.h
 %{_pkgconfigdir}/librrd.pc
 %{_mandir}/man3/librrd.3*