Accepting request 122067 from devel:languages:python

- Fix build with new automake (forwarded request 122048 from namtrac)

OBS-URL: https://build.opensuse.org/request/show/122067
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rrdtool?expand=0&rev=41
This commit is contained in:
Stephan Kulow 2012-05-29 09:36:24 +00:00 committed by Git OBS Bridge
commit f0b4f5a26b
3 changed files with 23 additions and 0 deletions

16
rrdtool-automake.patch Normal file
View File

@ -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

View File

@ -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

View File

@ -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