rpms/zoneminder/devel zoneminder.spec,1.11,1.12

[Jason ティビツ (tibbs)]

Author: tibbs

Update of /cvs/extras/rpms/zoneminder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25742

Modified Files:
	zoneminder.spec 
Log Message:
* Fri Jul 11 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.23.3-1
- Initial attempt at packaging 1.23.



Index: zoneminder.spec
===================================================================
RCS file: /cvs/extras/rpms/zoneminder/devel/zoneminder.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- zoneminder.spec	1 Jul 2008 22:44:47 -0000	1.11
+++ zoneminder.spec	12 Jul 2008 00:52:33 -0000	1.12
@@ -4,33 +4,36 @@
 %define zmgid_final apache
 
 Name: 		zoneminder
-Version: 	1.22.3
-Release: 	15%{?dist}
+Version: 	1.23.3
+Release: 	1%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
-License:        GPLv2+
+# jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
+# Mootools is inder the MIT license: http://mootools.net/
+License:        GPLv2+ and LGPLv2+ and MIT 
 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
+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
-Patch1: 	zoneminder-1.22.3-dbinstall.patch
+Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
+Source6:    http://mootools.net/downloads/mootools-1.2-core-yc.js
+Patch1: 	zoneminder-1.23.3-dbinstall.patch
 Patch2:		zoneminder-1.22.3-runlevel.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
-Patch11:	zoneminder-1.22.3-gcc43.patch
-Patch12:	zoneminder-1.22.3-security.patch
 
 Conflicts: 	zm <= 1.22.3
 
-BuildRequires: 	automake
+BuildRequires: 	automake gnutls-devel
 BuildRequires: 	mysql-devel pcre-devel libjpeg-devel
 BuildRequires: 	perl(Archive::Tar) perl(Archive::Zip)
 BuildRequires:  perl(Date::Manip) perl(DBD::mysql)
 BuildRequires: 	perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
 BuildRequires: 	perl(MIME::Entity) perl(MIME::Lite)
+BuildRequires:  perl(PHP::Serialization)
 Requires: 	httpd php php-mysql
 Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: 	perl(DBD::mysql)
@@ -52,11 +55,18 @@
 
 %prep
 %setup -q -n ZoneMinder-%{version}
+
+# Unpack jscalendar and move some files around
+%setup -q -D -T -a 5 -n ZoneMinder-%{version}
+mkdir jscalendar-doc
+pushd jscalendar-1.0
+mv *html *php doc/* README ../jscalendar-doc
+rmdir doc
+popd
+
 %patch1 -p0 -b .dbinstall
 %patch2 -p0 -b .runlevel
 %patch10 -p0 -b .installfix
-%patch11 -p0 -b .gcc43
-%patch12 -p1 -b .security
 gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar
 cp %{SOURCE4} README.Fedora
 
@@ -111,6 +121,15 @@
 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
 
+# Install jscalendar - this really should be in its own package
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/www/jscalendar
+cp -rp jscalendar-1.0/* $RPM_BUILD_ROOT%{_datadir}/%{name}/www/jscalendar
+
+# Install mootools
+pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/www
+install -m 644 %{SOURCE6} mootools-1.2-core-yc.js
+ln -s mootools-1.2-core-yc.js mootools.js
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -135,7 +154,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README README.html README.pdf README.Fedora
+%doc AUTHORS COPYING README README.Fedora jscalendar-doc
 %config(noreplace) %attr(600,%{zmuid_final},%{zmgid_final}) %{_sysconfdir}/zm.conf
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf
 %attr(755,root,root) %{_initrddir}/zoneminder
@@ -143,7 +162,7 @@
 %{_bindir}/zma
 %{_bindir}/zmaudit.pl
 %{_bindir}/zmc
-%{_bindir}/zmcontrol-*.pl
+%{_bindir}/zmcontrol.pl
 %{_bindir}/zmdc.pl
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
@@ -172,6 +191,9 @@
 
 
 %changelog
+* Fri Jul 11 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.23.3-1
+- Initial attempt at packaging 1.23.
+
 * Tue Jul  1 2008 Martin Ebourne <martin at zepler.org> - 1.22.3-15
 - Add perl module compat dependency, bz #453590