From 6d8e5ed20b5b4508fc36e4e3513ae3869f8124f4 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 17 Jul 2006 13:58:25 +0000
Subject: [PATCH] - Update to rrdtool 1.2.15 - Merge all dist's spec files so
 they're all the same again - Minor configure cleanups

---
 .cvsignore   |  1 +
 rrdtool.spec | 11 ++++++-----
 sources      |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index e0701b3..942eb2f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 rrdtool-1.2.12.tar.gz
 rrdtool-1.2.13.tar.gz
 php4-svn839.tar.gz
+rrdtool-1.2.15.tar.gz
diff --git a/rrdtool.spec b/rrdtool.spec
index f34d9db..27c9391 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -3,8 +3,8 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.2.13
-Release: 7%{?dist}
+Version: 1.2.15
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -100,8 +100,6 @@ RRDtool bindings to the PHP HTML-embedded scripting language.
 
 %build
 %configure \
-    --program-prefix="%{?_program_prefix}" \
-    --libdir=%{_libdir} \
     --disable-static \
     --with-pic \
     --with-perl-options='INSTALLDIRS="vendor"'
@@ -124,7 +122,6 @@ popd
 %{__make} install DESTDIR="%{rrdtmp}"
 pushd php4/
 %configure \
-    --libdir=%{_libdir} \
     --with-rrdtool="%{rrdtmp}%{_prefix}" \
     --disable-static
 %{__make} %{?_smp_mflags}
@@ -222,6 +219,10 @@ find examples/ -type f -exec chmod 0644 {} \;
 %{php_extdir}/rrdtool.so
 
 %changelog
+* Mon Jul 17 2006 Jarod Wilson <jwilson@redhat.com> 1.2.15-1
+- Update to 1.2.15
+- Minor spec cleanups
+
 * Sat Jun 24 2006 Jarod Wilson <jwilson@redhat.com> 1.2.13-7
 - Fix up Obsoletes
 
diff --git a/sources b/sources
index 76e9003..49d1ea1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 7b544c38a818cbebcf06fe39b9f52d0d  rrdtool-1.2.12.tar.gz
 d9b5b7caa28e56de82780d943f59c231  rrdtool-1.2.13.tar.gz
 20f70c46a3643ebc51d7b8562d8af9b2  php4-svn839.tar.gz
+bde8b12c202bc4e27fb9a9588a0aaddf  rrdtool-1.2.15.tar.gz