- up to 1.0.44

- updated perl-install and system-libs patches

Changed files:
    rrdtool-perl-install.patch -> 1.3
    rrdtool-system-libs.patch -> 1.2
    rrdtool.spec -> 1.59

diff --git a/rrdtool-perl-install.patch b/rrdtool-perl-install.patch
index f04319e8effbc8c9bcbac9c7cb271c30177f94cd..c5175b50fbe905b8c917f0d0da5b3405dbe7edb8 100644 (file)
--- a/rrdtool-perl-install.patch
+++ b/rrdtool-perl-install.patch
@@ -1,19 +1,21 @@
---- rrdtool-1.0.37/Makefile.am.orig    Thu Mar 21 22:55:56 2002
-+++ rrdtool-1.0.37/Makefile.am Thu May  2 21:16:21 2002
-@@ -18,11 +18,11 @@
- # lets schedule the perl stuff for installation
+--- rrdtool-1.0.44/Makefile.am.orig    Thu Mar 21 22:55:56 2002
++++ rrdtool-1.0.44/Makefile.am Thu May  2 21:16:21 2002
+@@ -19,12 +19,12 @@
  # the special call to install-sh is because the -d switch is not portable
+ # mac os X has its perl module in bundles so it seems
  install-data-local:
 -      $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
 -      $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
 -      $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
 -      $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--      $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+-      [ -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ ] && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+-      [ -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle ] && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
 +      $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(perl_sitearch)/auto/RRDs
 +      $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(perl_sitearch)
 +      $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(perl_sitearch)
 +      $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(perl_sitearch)/auto/RRDs
-+      $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(perl_sitearch)/auto/RRDs
++      [ ! -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ ] || $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(perl_sitearch)/auto/RRDs
++      [ ! -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle ] || $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(perl_sitearch)/auto/RRDs
  
  
  # use relaxed rules when building dists

diff --git a/rrdtool-system-libs.patch b/rrdtool-system-libs.patch
index ab69765d0a8d036ba48fe092b70a775f474205c7..cfcf73e1b18afae0f088e5a18176145cee9b575f 100644 (file)
--- a/rrdtool-system-libs.patch
+++ b/rrdtool-system-libs.patch
@@ -84,14 +84,14 @@ diff -Nur rrdtool-1.0.42.orig/src/Makefile.am rrdtool-1.0.42/src/Makefile.am
      'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
      'realclean'    => {FILES => 't/demo?.rrd t/demo?.gif' }
  );
---- rrdtool-1.0.42/tcl/Makefile.am.orig        2002-02-26 11:21:52.000000000 +0100
-+++ rrdtool-1.0.42/tcl/Makefile.am     2003-04-17 21:07:51.000000000 +0200
+--- rrdtool-1.0.44/tcl/Makefile.am.orig        2002-02-26 11:21:52.000000000 +0100
++++ rrdtool-1.0.44/tcl/Makefile.am     2003-04-17 21:07:51.000000000 +0200
 @@ -21,7 +21,7 @@
  if COMP_TCL
  
- tclrrd$(TCL_SHLIB_SUFFIX): tclrrd.o
--      $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ -lrrd_private -lm
-+      $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ -lrrd -lm
+ $(TCL_LIB_FILE): tclrrd.o
+-      $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ -lrrd_private -lm -ltcl
++      $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ -lrrd -lm -ltcl
  
  tclrrd.o: tclrrd.c
        $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) -c $< -DVERSION=\"$(VERSION)\"

diff --git a/rrdtool.spec b/rrdtool.spec
index bb9e34e8c68030d761e4c8dbf9a516baa9dfd6c6..c85b85172a59d119f6d1d45162474dc3db616a3b 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -5,12 +5,12 @@ Summary(pt_BR):       Round Robin Database, uma ferramenta para constru
 Summary(ru):   RRDtool - ÂÁÚÁ ÄÁÎÎÙÈ Ó "ÃÉËÌÉÞÅÓËÉÍ ÏÂÎÏ×ÌÅÎÉÅÍ"
 Summary(uk):   RRDtool - ÃÅ ÓÉÓÔÅÍÁ ÚÂÅÒ¦ÇÁÎÎÑ ÔÁ ÐÏËÁÚÕ ÓÅÒ¦ÊÎÉÈ ÄÁÎÉÈ
 Name:          rrdtool
-Version:       1.0.42
-Release:       2
+Version:       1.0.44
+Release:       1
 License:       GPL
 Group:         Applications/Databases
 Source0:       http://ee-staff.ethz.ch/~oetiker/webtools/rrdtools/pub/%{name}-%{version}.tar.gz
-# Source0-md5: 20183bf09b52030a6e29a0678930bb42
+# Source0-md5: c3ab38d97e74478c40a703902abf9b23
 Patch0:                %{name}-makefile.patch
 Patch1:                %{name}-perl-install.patch
 Patch2:                %{name}-acfix.patch
@@ -147,6 +147,8 @@ RRD - 
 %patch2 -p1
 %patch3 -p1
 
+%{__perl} -pi -e 's/--localdir=/-B /g' Makefile.am */Makefile.am
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -161,8 +163,6 @@ RRD - 
 # uncoment this line ONLY IF tcl package is ready.
 #      --with-tclib=%{_prefix}
 
-%{__perl} -pi -e 's/--localdir=/-B /g' Makefile */Makefile */*/Makefile
-%{__perl} -pi -e 's/--localdir=/-B /g' Makefile.am */Makefile.am */*/Makefile.am
 %{__make}
 
 %install