SPECS: zoneminder.spec - BR: xorg-lib-libXv-devel - remove all cam...

[sls]

Author: sls                          Date: Tue Dec 11 15:21:04 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: xorg-lib-libXv-devel
- remove all cambozola stuff

---- Files affected:
SPECS:
   zoneminder.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: SPECS/zoneminder.spec
diff -u SPECS/zoneminder.spec:1.45 SPECS/zoneminder.spec:1.46
--- SPECS/zoneminder.spec:1.45	Fri Dec  7 21:20:20 2007
+++ SPECS/zoneminder.spec	Tue Dec 11 16:20:59 2007
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO:
-# - move cambozola to separate spec ?
 # - no globs for suid/sgid files
 # - webapps
 #
@@ -13,8 +12,6 @@
 Group:		Applications/Graphics
 Source0:	http://www.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
 # Source0-md5:	4677739d31807339d621e6e04bc62790
-# http://www.charliemouse.com/code/cambozola/
-Source1:	http://www.charliemouse.com/code/cambozola/cambozola-0.68.tar.gz
 # Source1-md5:	e4fac8b6ee94c9075b14bb95be4f860b
 Source2:	zm-init
 Source3:	zm.conf
@@ -41,6 +38,7 @@
 BuildRequires:	perl-Date-Manip
 BuildRequires:	perl-libwww
 BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	xorg-lib-libXv-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires:	perl-DBD-mysql
 Requires:	perl-Date-Manip
@@ -146,8 +144,6 @@
 
 %{__make}
 
-gunzip -c %{SOURCE1} | tar xf - --wildcards cambozola-*/dist/cambozola.jar
-
 %{__perl} -pi \
 		-e 's/(ZM_WEB_USER=).*$/${1}http/;' \
 		-e 's/(ZM_WEB_GROUP=).*$/${1}http/;' zm.conf
@@ -174,7 +170,6 @@
         ln -sf ../../../..%{_localstatedir}/lib/zoneminder/$dir $RPM_BUILD_ROOT%{_datadir}/zoneminder/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}/zoneminder/www/cambozola.jar
 install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zoneminder.conf
 install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
@@ -255,6 +250,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2007-12-11 15:20:59  sls
+- BR: xorg-lib-libXv-devel
+- remove all cambozola stuff
+
 Revision 1.45  2007-12-07 20:20:20  arekm
 - don't detect konqueror as mozilla
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zoneminder.spec?r1=1.45&r2=1.46&f=u