rpms/zoneminder/FC-6 README.Fedora, 1.1, 1.2 zoneminder-1.22.3-dbinstall.patch, 1.1, 1.2 zoneminder.spec, 1.1, 1.2

[Martin Ebourne (mebourne)]

Author: mebourne

Update of /cvs/pkgs/rpms/zoneminder/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4435

Modified Files:
	README.Fedora zoneminder-1.22.3-dbinstall.patch 
	zoneminder.spec 
Log Message:
Fixes from testing by Jitz including missing dependencies and database creation


Index: README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/FC-6/README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.Fedora	1 Jul 2007 00:38:38 -0000	1.1
+++ README.Fedora	13 Jul 2007 00:19:36 -0000	1.2
@@ -1,8 +1,31 @@
-The Zoneminder web interface is disabled by default, you will need to edit
-this file to enable it:
+New installs
+============
 
-/etc/httpd/conf.d/zoneminder.conf
+1. Unless you are already using the MySQL server or you are running it
+   remotely you will need to ensure that the server is installed:
 
-This package probably does not work with SELinux enabled at the moment. It may
-be necessary to disable SELinux for httpd, or even completely for Zoneminder
-to function. This will be addressed in a later release.
+     yum install mysql-server
+
+2. You will need to create the ZoneMinder database. These commands should do
+   the trick:
+
+     mysql mysql < /usr/share/zoneminder/db/zm_create.sql
+     mysqladmin reload
+
+3. The ZoneMinder web interface is disabled by default, you will need to edit
+   this file to enable it:
+
+     /etc/httpd/conf.d/zoneminder.conf
+
+4. This package probably does not work with SELinux enabled at the moment. It
+   may be necessary to disable SELinux for httpd, or even completely for
+   ZoneMinder to function. This will be addressed in a later release.
+
+
+Upgrades
+========
+
+1. You will need to upgrade the ZoneMinder database as described in the
+   manual. This command should be sufficient:
+
+     zmupdate.pl --version=<from version>

zoneminder-1.22.3-dbinstall.patch:

Index: zoneminder-1.22.3-dbinstall.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/FC-6/zoneminder-1.22.3-dbinstall.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zoneminder-1.22.3-dbinstall.patch	1 Jul 2007 00:38:38 -0000	1.1
+++ zoneminder-1.22.3-dbinstall.patch	13 Jul 2007 00:19:36 -0000	1.2
@@ -82,17 +82,30 @@
  
  loadconf()
  {
-@@ -29,7 +29,7 @@
+@@ -27,9 +27,8 @@
+ start()
+ {
  	zmupdate || return $?
- 	loadconf || return $?
+-	loadconf || return $?
  	#Make sure the directory for our PID folder exists or create one.
 -	[ ! -d /var/run/zm ] \
 +	[ ! -d $pidfile ] \
  		&& mkdir -m 774 $pidfile \
  		&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $pidfile
  	#Make sure the folder for the socks file exists or create one
-@@ -63,11 +63,11 @@
- 	loadconf
+@@ -49,7 +48,6 @@
+ 
+ stop()
+ {
+-	loadconf
+ 	echo -n $"Stopping $prog: "
+ 	$command stop
+ 	RETVAL=$?
+@@ -60,22 +58,21 @@
+ 
+ zmstatus()
+ {
+-	loadconf
  	result=`$command status`
  	if [ "$result" = "running" ]; then
 -		echo "ZoneMinder is running"
@@ -105,3 +118,21 @@
  		RETVAL=1
  	fi
  }
+ 
+ zmupdate()
+ {
+-	if [ -x $ZM_PATH_BIN/zm_update ]; then
+-		$ZM_PATH_BIN/zm_update noi
++	if [ -x $ZM_PATH_BIN/zmupdate.pl ]; then
++		$ZM_PATH_BIN/zmupdate.pl --freshen >/dev/null
+ 	fi
+ }
+ 
+@@ -92,7 +89,6 @@
+ 		start
+ 		;;
+ 	'condrestart')
+-		loadconf
+ 		result=`$ZM_PATH_BIN/zmdc.pl check`
+ 		if [ "$result" = "running" ]; then
+ 			$ZM_PATH_BIN/zmdc.pl shutdown > /dev/null


Index: zoneminder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/FC-6/zoneminder.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zoneminder.spec	1 Jul 2007 00:38:38 -0000	1.1
+++ zoneminder.spec	13 Jul 2007 00:19:36 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name: 		zoneminder
 Version: 	1.22.3
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 License:        GPL
@@ -28,7 +28,8 @@
 BuildRequires:  perl(Date::Manip) perl(DBD::mysql)
 BuildRequires: 	perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
 BuildRequires: 	perl(MIME::Entity) perl(MIME::Lite)
-Requires: 	httpd perl(DBD::mysql)
+Requires: 	httpd php php-mysql
+Requires: 	perl(DBD::mysql)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -52,6 +53,12 @@
 gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar
 cp %{SOURCE4} README.Fedora
 
+cat <<EOF >> db/zm_create.sql.in
+update Config set Value = '/cgi-bin/zm/nph-zms' where Name = 'ZM_PATH_ZMS';
+use mysql;
+grant select,insert,update,delete on zm.* to 'zmuser'@localhost identified by 'zmpass';
+EOF
+
 
 %build
 autoreconf
@@ -158,6 +165,9 @@
 
 
 %changelog
+* Thu Jul 12 2007 Martin Ebourne <martin at zepler.org> - 1.22.3-7
+- Fixes from testing by Jitz including missing dependencies and database creation
+
 * Sat Jun 30 2007 Martin Ebourne <martin at zepler.org> - 1.22.3-6
 - Disable crashtrace on ppc