remove non-free treeview bits (replace with jquery future code from 0.8.9 trunk)

.gitignore

@@ -3,3 +3,4 @@ cacti-0.8.7g.tar.gz
 /cacti-0.8.7i.tar.gz
 /cacti-0.8.8.tar.gz
 /cacti-0.8.8a.tar.gz
+/cacti-0.8.8a-notreeview.tar.gz

cacti.spec

@@ -1,16 +1,25 @@
 Name: cacti
 Version: 0.8.8a
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
 # There's a lot of stuff in there. It's all compatible.
 License: GPLv2+ and LGPLv2 and (MPLv1.1 or GPLv2 or LGPLv2) and (LGPLv2 or BSD)
 URL: http://www.cacti.net/
-Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
+# Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
+# Just unpack, rm -rf include/treeview/* , then	repack.
+Source0: %{name}-%{version}-notreeview.tar.gz
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+Source4: d.gif
+Source5: d.png
+Source6: throbber.gif
+# Add replacement files for treeview
+Patch0: cacti-0.8.8a-legal.patch
+# Thanks to Paul Gevers
+Patch1: Third-try-on-jstree-inclusion.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +39,10 @@ used to creating traffic graphs with MRTG.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1 -b .notreeview
+cp %{SOURCE4} %{SOURCE5} %{SOURCE6} include/js/jquery/themes/default/
+rm -rf include/treeview
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -115,6 +128,9 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Jan  4 2013 Tom Callaway <spot@fedoraproject.org> - 0.8.8a-4
+- remove non-free treeview bits (replace with jquery future code from 0.8.9 trunk)
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.8a-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

sources

@@ -1 +1 @@
-a4da682dab9a88a2e0edb1728bf531ae  cacti-0.8.8a.tar.gz
+0650becd06fb41a5fb6ea08e79ed5c3e  cacti-0.8.8a-notreeview.tar.gz