[zoneminder] Use separately-packaged cambozola jar.

[Jason ティビツ]

commit d637c48ed54ee392c4086de05fdc6b67562c2a4d
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Sat Jan 22 00:08:03 2011 -0600

    Use separately-packaged cambozola jar.

 zoneminder.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/zoneminder.spec b/zoneminder.spec
index 1c8ca12..2ed2fce 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.24.2
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -15,7 +15,6 @@ URL:        http://www.zoneminder.com/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source:     http://www.zoneminder.com/fileadmin/downloads/ZoneMinder-%{version}.tar.gz
-Source1: 	http://www.charliemouse.com/code/cambozola/cambozola-0.68.tar.gz
 Source2: 	zoneminder.conf
 Source3: 	redalert.wav
 Source4: 	README.Fedora
@@ -38,7 +37,7 @@ BuildRequires: 	perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
 BuildRequires: 	perl(MIME::Entity) perl(MIME::Lite)
 BuildRequires:  perl(PHP::Serialization)
 
-Requires: 	httpd php php-mysql
+Requires: 	httpd php php-mysql cambozola
 Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: 	perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
 Requires:   perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
@@ -56,7 +55,7 @@ have attached to a Linux based machine. It is designed to run on kernels which
 support the Video For Linux (V4L) interface and has been tested with cameras
 attached to BTTV cards, various USB cameras and IP network cameras. It is
 designed to support as many cameras as you can attach to your computer without
-too much degradation of performance. This package includes cambozola.jar.
+too much degradation of performance.
 
 
 %prep
@@ -76,7 +75,6 @@ popd
 %patch4 -p0 -b .perldep
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc44
-gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar
 cp %{SOURCE4} README.Fedora
 
 cat <<EOF >> db/zm_create.sql.in
@@ -125,7 +123,6 @@ do
 	ln -sf ../../../..%{_localstatedir}/lib/zoneminder/$dir $RPM_BUILD_ROOT%{_datadir}/%{name}/www/$dir
 done
 install -D -m 755 scripts/zm $RPM_BUILD_ROOT%{_initrddir}/zoneminder
-install -D -m 644 cambozola-*/dist/cambozola.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/www/cambozola.jar
 install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zoneminder.conf
 install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/www/sounds/redalert.wav
 
@@ -133,6 +130,11 @@ install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/www/sounds/redal
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/www/jscalendar
 cp -rp jscalendar-1.0/* $RPM_BUILD_ROOT%{_datadir}/%{name}/www/jscalendar
 
+# Set up cambozola
+pushd %{buildroot}/%{_datadir}/%{name}/www
+ln -s ../../java/cambozola.jar
+popd
+
 # Install mootools
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/www
 install -m 644 %{SOURCE6} mootools-1.2.3-core-yc.js
@@ -199,6 +201,9 @@ fi
 
 
 %changelog
+* Fri Jan 21 2011 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.24.2-6
+- Unbundle mootools; instead link to the separately pacakged copy.
+
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.24.2-5
 - Mass rebuild with perl-5.12.0