[arch-commits] Commit in rrdtool/trunk (ChangeLog PKGBUILD gcc-4.5-issue-262.patch)

[Eric Bélanger]

    Date: Thursday, August 12, 2010 @ 18:25:42
  Author: eric
Revision: 87355

upgpkg: rrdtool 1.4.4-1
Upstream update, Corrected license, Removed old patch

Modified:
  rrdtool/trunk/ChangeLog
  rrdtool/trunk/PKGBUILD
Deleted:
  rrdtool/trunk/gcc-4.5-issue-262.patch

-------------------------+
 ChangeLog               |    7 +++++++
 PKGBUILD                |   22 +++++++++++-----------
 gcc-4.5-issue-262.patch |   11 -----------
 3 files changed, 18 insertions(+), 22 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-08-12 20:52:49 UTC (rev 87354)
+++ ChangeLog	2010-08-12 22:25:42 UTC (rev 87355)
@@ -1,3 +1,10 @@
+2010-08-12  Eric Belanger  <eric at archlinux.org>
+
+	* rrdtool 1.4.4-1
+	* Upstream update
+	* Corrected license
+	* Removed old patch
+
 2010-04-29  Eric Belanger  <eric at archlinux.org>
 
 	* rrdtool 1.4.3-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-12 20:52:49 UTC (rev 87354)
+++ PKGBUILD	2010-08-12 22:25:42 UTC (rev 87355)
@@ -3,12 +3,12 @@
 # Contributor: Tom K <tom at archlinux.org>
 
 pkgname=rrdtool
-pkgver=1.4.3
-pkgrel=2
+pkgver=1.4.4
+pkgrel=1
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64')
 url="http://www.rrdtool.org"
-license=('GPL')
+license=('GPL' 'custom')
 depends=('libpng' 'libxml2' 'pango')
 makedepends=('intltool' 'ruby' 'python' 'tcl' 'lua')
 optdepends=('tcl: to use corresponding binding' \
@@ -16,24 +16,24 @@
             'ruby: to use corresponding binding' \
             'lua: to use corresponding binding')
 options=('!libtool' '!emptydirs' '!makeflags')
-source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz
-        gcc-4.5-issue-262.patch)
-md5sums=('492cf946c72f85987238faa2c311b7bb'
-         '4ee60200c9d0d43444b884958444579b')
+changelog=ChangeLog
+source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
+md5sums=('93ad2fc2e9ddcd7d99c611fe30284a54')
+sha1sums=('e4715c13f2a6fd077c54911d396eb573788377b0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np3 < "${srcdir}/gcc-4.5-issue-262.patch"
   ./configure --prefix=/usr --localstatedir=/var --disable-rpath --enable-perl \
     --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
     --enable-ruby --enable-ruby-site-install --enable-python \
     --enable-lua --enable-lua-site-install \
-    --enable-tcl || return 1
-  make || return 1
+    --enable-tcl
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" LIBRUBYARG_SHARED="-Wl,-L/usr/lib -lruby" \
-    LIBPATH="-L. -L/usr/lib -L../../src/.libs" install || return 1
+    LIBPATH="-L. -L/usr/lib -L../../src/.libs" install
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: gcc-4.5-issue-262.patch
===================================================================
--- gcc-4.5-issue-262.patch	2010-08-12 20:52:49 UTC (rev 87354)
+++ gcc-4.5-issue-262.patch	2010-08-12 22:25:42 UTC (rev 87355)
@@ -1,11 +0,0 @@
-Index: /trunk/program/src/rrd_format.h
-===================================================================
---- /trunk/program/src/rrd_format.h	(revision 2042)
-+++ /trunk/program/src/rrd_format.h	(revision 2069)
-@@ -36,5 +36,5 @@
- #define RRD_VERSION   "0004"
- #define RRD_VERSION3  "0003"
--#define FLOAT_COOKIE  8.642135E130
-+#define FLOAT_COOKIE  ((double)8.642135E130)
- 
- typedef union unival {