- merged 1.7.0 from PLD

diff --git a/rrdtool.spec b/rrdtool.spec
index 24cc7bb586780366f5ddaac024fed8547dd1488a..826be808ab96ca6e4643c640caf7b5bbe4476ad5 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -23,12 +23,12 @@ 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
 Summary(ru.UTF-8):     RRDtool - база данных с "циклическим обновлением"
 Summary(uk.UTF-8):     RRDtool - це система зберігання та показу серійних даних
 Name:          rrdtool

-Version:       1.5.5
+Version:       1.7.0

 Release:       1
 License:       GPL v2+ + FLOSS exception
 Group:         Applications/Databases
 Release:       1
 License:       GPL v2+ + FLOSS exception
 Group:         Applications/Databases

-Source0:       http://oss.oetiker.ch/rrdtool/pub/%{name}-%{version}.tar.gz
-# Source0-md5: d8b3dcb3d193c2d6ad0a282bde69ee11
+Source0:       https://oss.oetiker.ch/rrdtool/pub/%{name}-%{version}.tar.gz
+# Source0-md5: 2f37eeb613bed11077470c9e2057010e

 Patch0:                %{name}-tcl-path.patch
 Patch1:                %{name}-missing.patch
 URL:           http://oss.oetiker.ch/rrdtool/
 Patch0:                %{name}-tcl-path.patch
 Patch1:                %{name}-missing.patch
 URL:           http://oss.oetiker.ch/rrdtool/


@@ -372,9 +372,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc CHANGES CONTRIBUTORS NEWS THREADS TODO
 %attr(755,root,root) %{_libdir}/librrd.so.*.*.*
 %defattr(644,root,root,755)
 %doc CHANGES CONTRIBUTORS NEWS THREADS TODO
 %attr(755,root,root) %{_libdir}/librrd.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir}/librrd.so.4
-%attr(755,root,root) %{_libdir}/librrd_th.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librrd_th.so.4
+%attr(755,root,root) %ghost %{_libdir}/librrd.so.8

 %{?with_rrdcgi:%attr(755,root,root) %{_bindir}/rrdcgi}
 %attr(755,root,root) %{_bindir}/rrdcreate
 %attr(755,root,root) %{_bindir}/rrdinfo
 %{?with_rrdcgi:%attr(755,root,root) %{_bindir}/rrdcgi}
 %attr(755,root,root) %{_bindir}/rrdcreate
 %attr(755,root,root) %{_bindir}/rrdinfo


@@ -394,6 +392,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/rrdinfo.1*
 %{_mandir}/man1/rrdlast.1*
 %{_mandir}/man1/rrdlastupdate.1*
 %{_mandir}/man1/rrdinfo.1*
 %{_mandir}/man1/rrdlast.1*
 %{_mandir}/man1/rrdlastupdate.1*

+%{_mandir}/man1/rrdlist.1*

 %{?with_ceph:%{_mandir}/man1/rrdrados.1*}
 %{_mandir}/man1/rrdresize.1*
 %{_mandir}/man1/rrdrestore.1*
 %{?with_ceph:%{_mandir}/man1/rrdrados.1*}
 %{_mandir}/man1/rrdresize.1*
 %{_mandir}/man1/rrdrestore.1*


@@ -413,8 +412,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librrd.so
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librrd.so

-%attr(755,root,root) %{_libdir}/librrd_th.so
-%{_libdir}/librrd_th.la

 %{_includedir}/rrd*.h
 %{_pkgconfigdir}/librrd.pc
 %{_mandir}/man3/librrd.3*
 %{_includedir}/rrd*.h
 %{_pkgconfigdir}/librrd.pc
 %{_mandir}/man3/librrd.3*


@@ -422,7 +419,6 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/librrd.a
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/librrd.a

-%{_libdir}/librrd_th.a

 
 %files doc
 %defattr(644,root,root,755)
 
 %files doc
 %defattr(644,root,root,755)


@@ -453,7 +449,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/rrdtool.so
 %if "%{py_ver}" > "2.4"
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/rrdtool.so
 %if "%{py_ver}" > "2.4"

-%{py_sitedir}/py_rrdtool-*.egg-info
+%{py_sitedir}/rrdtool-*.egg-info

 %endif
 %endif
 
 %endif
 %endif