Accepting request 122048 from home:namtrac:branches:devel:languages:python

- Fix build with new automake

OBS-URL: https://build.opensuse.org/request/show/122048
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=29

rrdtool-automake.patch

@@ -0,0 +1,16 @@
+Index: rrdtool-1.4.7/bindings/tcl/Makefile.am
+===================================================================
+--- rrdtool-1.4.7.orig/bindings/tcl/Makefile.am
++++ rrdtool-1.4.7/bindings/tcl/Makefile.am
+@@ -27,8 +27,9 @@ tclpkgdir = @TCL_PACKAGE_DIR@
+ tclpkg_DATA = pkgIndex.tcl
+ tclpkg_SCRIPTS = ifOctets.tcl
+ else
+-pkglib_DATA = pkgIndex.tcl
+-pkglib_SCRIPTS = ifOctets.tcl
++datalibdir=$(pkglibdir)
++datalib_DATA = pkgIndex.tcl
++datalib_SCRIPTS = ifOctets.tcl
+ endif
+ 
+ # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as

rrdtool.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 24 10:25:44 UTC 2012 - idonmez@suse.com
+
+- Fix build with new automake 
+
 -------------------------------------------------------------------
 Tue Apr  3 11:52:10 UTC 2012 - saschpe@suse.de
 

rrdtool.spec

@@ -51,6 +51,7 @@ Source:         %{name}-%{version}.tar.gz
 Patch1:         rrdtool-lua_lib64.patch
 Patch2:         rrdtool-tclversion.patch
 Patch3:         rrdtool-tclsegfault.patch
+Patch4:         rrdtool-automake.patch
 # http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
 Source1:        cgilib-%{cgilib_version}.tar.bz2
 Patch11:        cgilib-fix_automake.patch
@@ -74,6 +75,7 @@ definable time period.
 %endif
 %patch2
 %patch3
+%patch4 -p1
 pushd "cgilib-%{cgilib_version}"
 %patch11
 popd #cgilib