- up to 1.4.8

- automake fixed upstream

diff --git a/rrdtool-am.patch b/rrdtool-am.patch
deleted file mode 100644 (file)
index ca58252..0000000
--- a/rrdtool-am.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- rrdtool-1.4.5/bindings/tcl/Makefile.am~    2008-10-01 22:01:43.000000000 +0200
-+++ rrdtool-1.4.5/bindings/tcl/Makefile.am     2012-02-08 22:51:52.742051498 +0100
-@@ -27,8 +27,8 @@
- tclpkg_DATA = pkgIndex.tcl
- tclpkg_SCRIPTS = ifOctets.tcl
- else
--pkglib_DATA = pkgIndex.tcl
--pkglib_SCRIPTS = ifOctets.tcl
-+pkgdata_DATA = pkgIndex.tcl
-+pkgdata_SCRIPTS = ifOctets.tcl
- endif
- 
- # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as

diff --git a/rrdtool.spec b/rrdtool.spec
index e11fc972ea5652a63222a8a7fa9eeba26cdb51b1..dc89c49c9c6943c3e128766ab6cc1664032dd131 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -15,14 +15,13 @@ 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.4.7
-Release:       2
+Version:       1.4.8
+Release:       1
 License:       GPL v2+ + FLOSS exception
 Group:         Applications/Databases
 Source0:       http://oss.oetiker.ch/rrdtool/pub/%{name}-%{version}.tar.gz
-# Source0-md5: ffe369d8921b4dfdeaaf43812100c38f
+# Source0-md5: dbe59386db97fd2f2216729facd74ca8
 Patch0:                %{name}-tcl-path.patch
-Patch1:                %{name}-am.patch
 URL:           http://oss.oetiker.ch/rrdtool/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -248,7 +247,6 @@ Rozszerzenie Tcl-a pozwalające na dostęp do biblioteki Tcl.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 sed -i -e 's#\$TCL_PACKAGE_PATH#%{_prefix}/lib#g' configure.ac
 sed -i -e 's#/lib/lua/#/%{_lib}/lua/#g' configure.ac
@@ -288,6 +286,8 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/librrd.la
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT