Mailinglist Archive: opensuse-commit (1385 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package rrdtool for openSUSE:Factory
checked in at Thu May 12 11:01:06 CEST 2011.



--------
--- rrdtool/rrdtool.changes     2010-12-28 03:59:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/rrdtool/rrdtool.changes        2011-05-11 
13:52:40.000000000 +0200
@@ -1,0 +2,7 @@
+Wed May 11 11:48:32 UTC 2011 - max@xxxxxxxxxx
+
+- Move the Tcl bindings into a separate subpackage.
+- Remove the superfluous call to (bnc#693085).
+- Adopt the current practice of packaging Tcl extensions.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  rrdtool-tclversion.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rrdtool.spec ++++++
--- /var/tmp/diff_new_pack.v2lbJ8/_old  2011-05-12 10:59:51.000000000 +0200
+++ /var/tmp/diff_new_pack.v2lbJ8/_new  2011-05-12 10:59:51.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package rrdtool (Version 1.4.5)
+# spec file for package rrdtool
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -35,11 +35,12 @@
 Group:          Productivity/Scientific/Math
 Requires:       perl = %{perl_version}
 Version:        1.4.5
-Release:        1
+Release:        6
 %define cgilib_version 0.7
 # http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
 Source:         %{name}-%{version}.tar.bz2
 Patch1:         rrdtool-lua_lib64.patch
+Patch2:         rrdtool-tclversion.patch
 # 
http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
 Source1:        cgilib-%{cgilib_version}.tar.bz2
 Patch11:        cgilib-fix_automake.patch
@@ -59,6 +60,7 @@
 %if %{_lib}==lib64
 %patch1
 %endif
+%patch2
 pushd "cgilib-%{cgilib_version}"
 %patch11
 popd #cgilib
@@ -108,9 +110,7 @@
     ihtmldir=%{_docdir}/%{name}/html/ \
     examplesdir=%{_docdir}/%{name}/examples/ \
     libdir=%{_libdir} \
-    pkglibdir=%_datadir/tcl/tclrrd%version \
-    TCL_PACKAGE_DIR=%_datadir/tcl/tclrrd%version \
-    TCL_PACKAGE_PATH=%_datadir/tcl \
+    pkglibdir=%tcl_archdir/tclrrd%version \
     install
 # we install this later again
 rm -r $RPM_BUILD_ROOT%{_prefix}/lib/perl
@@ -134,11 +134,6 @@
 find "%{buildroot}" -type f -name '*.la' -exec %__rm {} \;
 # documentation
 install -m 644 CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO 
$RPM_BUILD_ROOT/%{_docdir}/%{name}
-# Script libraries for Tcl extensions should be in a package-specific
-# subdir of /usr/share/tcl
-mkdir -p $RPM_BUILD_ROOT/usr/share/tcl/tclrrd%{version}
-#mv $RPM_BUILD_ROOT/usr/lib/tclrrd%{version}/pkgIndex.tcl \
-#   $RPM_BUILD_ROOT/usr/share/tcl/tclrrd%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,10 +147,8 @@
 %doc %{_docdir}/rrdtool
 %doc %{_mandir}/*/*
 /usr/bin/*
-%{_datadir}/tcl
 %{_libdir}/librrd.so.*
 %{_libdir}/librrd_th.so.*
-%{_libdir}/tclrrd*.so
 %{perl_vendorlib}/RRDp.pm
 %{perl_vendorarch}/RRDs.pm
 #%{perl_vendorarch}/ntmake.pl
@@ -228,4 +221,23 @@
 %{_libdir}/lua/*/rrd.so.*
 %endif
 
+%package -n tcl-rrdtool
+License:        GPLv2+
+Summary:        Tcl bindings for rrdtool
+Group:          Productivity/Scientific/Math
+Requires:       tcl
+
+%description -n tcl-rrdtool
+A tool to log and analyze data gathered from all kinds of data sources.
+The data analysis part of RRDtool is based on the ability to quickly
+generate graphical representations of the data values collected over a
+definable time period.
+
+This package contains the Tcl bindings
+
+%files -n tcl-rrdtool
+%defattr(-, root, root)
+%{tcl_archdir}/*
+%{_libdir}/tclrrd*.so
+
 %changelog

++++++ rrdtool-tclversion.patch ++++++
Index: bindings/tcl/tclrrd.c
===================================================================
--- bindings/tcl/tclrrd.c.orig
+++ bindings/tcl/tclrrd.c
@@ -678,10 +678,6 @@ static int init(
     if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL)
         return TCL_ERROR;
 
-    if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 1) == NULL) {
-        return TCL_ERROR;
-    }
-
     /*
      * Why a global array?  In keeping with the Rrd:: namespace, why
      * not simply create a normal variable Rrd::version and set it?

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx