Hello community, here is the log from the commit of package rrdtool for openSUSE:Factory checked in at 2013-06-06 15:06:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rrdtool (Old) and /work/SRC/openSUSE:Factory/.rrdtool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rrdtool" Changes: -------- --- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes 2013-04-05 17:05:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2013-06-06 15:06:43.000000000 +0200 @@ -1,0 +2,17 @@ +Sat Jun 1 09:20:20 UTC 2013 - sch...@suse.de + +- Work around makefile dependencies on installed ruby headers during + installation +- Avoid running autoreconf, remove rrdtool-automake.patch + +------------------------------------------------------------------- +Wed May 29 11:07:08 UTC 2013 - mhruse...@suse.com + +- Fix the hack from previous entry to work everywhere + +------------------------------------------------------------------- +Thu May 16 13:54:25 UTC 2013 - vdziewie...@suse.com + +- Fix build failure: make looks for ruby.h in wrong place. + +------------------------------------------------------------------- Old: ---- rrdtool-automake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rrdtool.spec ++++++ --- /var/tmp/diff_new_pack.OnWg0W/_old 2013-06-06 15:06:43.000000000 +0200 +++ /var/tmp/diff_new_pack.OnWg0W/_new 2013-06-06 15:06:43.000000000 +0200 @@ -51,7 +51,6 @@ Patch1: rrdtool-lua_lib64.patch Patch2: rrdtool-tclversion.patch Patch3: rrdtool-tclsegfault.patch -Patch4: rrdtool-automake.patch Source1: http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz Patch11: cgilib-fix_automake.patch Url: http://oss.oetiker.ch/rrdtool/ @@ -74,7 +73,6 @@ %endif %patch2 %patch3 -%patch4 -p1 pushd "cgilib-%{cgilib_version}" %patch11 popd #cgilib @@ -102,11 +100,6 @@ if [ ! -d m4 ]; then mkdir m4; fi # we need getext 0.18 #autoreconf -i -f -%if %{_lib}==lib64 -# don't pass -i to autoreconf, that'll run autopoint which will go -# nuts because of the supposedly outdated gettext version: -autoreconf -fv -%endif export LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \ %configure --disable-static --with-pic --enable-shared \ --with-tcllib=%{_libdir} \ @@ -117,6 +110,8 @@ %install #eval `perl -V:installarchlib` +# Override hdrdir and rubyhdrdir to avoid makefile dependencies on +# installed ruby headers to be prefixed with %{buildroot} make \ DESTDIR=$RPM_BUILD_ROOT \ idocdir=%{_docdir}/%{name}/txt/ \ @@ -124,6 +119,8 @@ examplesdir=%{_docdir}/%{name}/examples/ \ libdir=%{_libdir} \ pkglibdir=%tcl_archdir/tclrrd%version \ + hdrdir=%{_includedir}/ruby-2.0.0 \ + rubyhdrdir=%{_includedir}/ruby-2.0.0 \ install # we install this later again rm -r $RPM_BUILD_ROOT%{_prefix}/lib/perl ++++++ rrdtool-lua_lib64.patch ++++++ --- /var/tmp/diff_new_pack.OnWg0W/_old 2013-06-06 15:06:43.000000000 +0200 +++ /var/tmp/diff_new_pack.OnWg0W/_new 2013-06-06 15:06:43.000000000 +0200 @@ -1,6 +1,21 @@ ---- configure.ac.orig 2010-12-28 03:34:15.000000000 +0100 -+++ configure.ac 2010-12-28 03:34:27.000000000 +0100 -@@ -783,7 +783,7 @@ +Index: configure +=================================================================== +--- configure.orig ++++ configure +@@ -29316,7 +29316,7 @@ fi + done + fi + +- LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot" ++ LUA_RRD_LIBDIR="$langpref/lib64/lua/$lua_vdot" + # if lua 5.0 can't find compat-5.1, force installation of + # compat-5.1.lua together with RRDtool. + if test "$lua_vdot" = "5.0" -a "$LUA_HAVE_COMPAT51" != "HAVE_COMPAT51"; then +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -782,7 +782,7 @@ LUA_EOF done fi -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
