From 51c056ef136ea69c4fc3eaf078f87eb412dc4c0d Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Mon, 30 Apr 2012 11:08:11 -0600
Subject: [PATCH] New upstream release (BZ #817506)

- Drop upstreamed $url_path patch
---
 .gitignore                         |  1 +
 cacti-0.8.8-default-url-path.patch | 26 --------------------------
 cacti.spec                         | 13 ++++++-------
 sources                            |  2 +-
 4 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 cacti-0.8.8-default-url-path.patch

diff --git a/.gitignore b/.gitignore
index a18e8ce..c353e92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ cacti-0.8.7g.tar.gz
 /cacti-0.8.7h.tar.gz
 /cacti-0.8.7i.tar.gz
 /cacti-0.8.8.tar.gz
+/cacti-0.8.8a.tar.gz
diff --git a/cacti-0.8.8-default-url-path.patch b/cacti-0.8.8-default-url-path.patch
deleted file mode 100644
index 8ba51f9..0000000
--- a/cacti-0.8.8-default-url-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/cacti/branches/0.8.8/include/config.php.dist b/cacti/branches/0.8.8/include/config.php.dist
-index fa59eef..20c1929 100644
---- a/cacti/branches/0.8.8/include/config.php.dist
-+++ b/cacti/branches/0.8.8/include/config.php
-@@ -36,7 +36,7 @@ $database_ssl = false;
-    ex: if your cacti install as at http://serverip/cacti/ this
-    would be set to /cacti/
- */
--//$url_path = "/";
-+//$url_path = "/cacti/";
- 
- /* Default session name - Session name must contain alpha characters */
- //$cacti_session_name = "Cacti";
-diff --git a/cacti/branches/0.8.8/include/global.php b/cacti/branches/0.8.8/include/global.php
-index 4e3bdbb..e41515d 100644
---- a/cacti/branches/0.8.8/include/global.php
-+++ b/cacti/branches/0.8.8/include/global.php
-@@ -43,7 +43,7 @@ $database_ssl = false;
- $cacti_session_name = "Cacti";
- 
- /* define default url path */
--$url_path = "/";
-+$url_path = "/cacti/";
- 
- /* Include configuration */
- include(dirname(__FILE__) . "/config.php");
diff --git a/cacti.spec b/cacti.spec
index f7ebe97..f418b27 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.8
-Release: 3%{?dist}
+Version: 0.8.8a
+Release: 1%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,7 +11,6 @@ Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
-Patch0: cacti-0.8.8-default-url-path.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,10 +33,6 @@ used to creating traffic graphs with MRTG.
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
-# Use "/cacti/" for the default URL, if none is defined.
-# http://bugs.cacti.net/view.php?id=2217
-%patch0 -p4
-
 %install
 rm -rf %{buildroot}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
@@ -119,6 +114,10 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Mon Apr 30 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.8a-1
+- New upstream release (BZ #817506)
+- Drop upstreamed $url_path patch
+
 * Wed Apr 11 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.8-3
 - Patch $url_path to default to "/cacti/" (upstream bug 2217)
 
diff --git a/sources b/sources
index 47a8ff0..106d01f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-574c4266524c084d1ea5a5443beb6dde  cacti-0.8.8.tar.gz
+a4da682dab9a88a2e0edb1728bf531ae  cacti-0.8.8a.tar.gz