rpms/zoneminder/devel zoneminder-1.24.1-dbinstall.patch, NONE, 1.1 zoneminder-1.24.1-runlevel.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 zoneminder.spec, 1.15, 1.16 zoneminder-1.22.3-runlevel.patch, 1.1, NONE zoneminder-1.23.3-dbinstall.patch, 1.1, NONE

[Martin Ebourne]

Author: mebourne

Update of /cvs/pkgs/rpms/zoneminder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23349

Modified Files:
	.cvsignore sources zoneminder.spec 
Added Files:
	zoneminder-1.24.1-dbinstall.patch 
	zoneminder-1.24.1-runlevel.patch 
Removed Files:
	zoneminder-1.22.3-runlevel.patch 
	zoneminder-1.23.3-dbinstall.patch 
Log Message:
* Sun Mar 15 2009 Martin Ebourne <martin at zepler.org> - 1.24.1-1
- Upgrade to 1.24.1


zoneminder-1.24.1-dbinstall.patch:

--- NEW FILE zoneminder-1.24.1-dbinstall.patch ---
--- db/Makefile.am.orig	2006-12-27 23:50:07.000000000 +0000
+++ db/Makefile.am	2006-12-27 23:50:21.000000000 +0000
@@ -1,7 +1,16 @@
 AUTOMAKE_OPTIONS = gnu
 
+zmdbdatadir = $(pkgdatadir)/db
+
 EXTRA_DIST = \
 	zm_create.sql.in \
+	$(dbupgrade_scripts)
+
+dist_zmdbdata_DATA = \
+	zm_create.sql \
+	$(dbupgrade_scripts)
+
+dbupgrade_scripts = \
 	zm_update-0.0.1.sql \
 	zm_update-0.9.7.sql \
 	zm_update-0.9.8.sql \
--- scripts/zmupdate.pl.orig	2006-12-27 23:59:20.000000000 +0000
+++ scripts/zmupdate.pl	2006-12-27 23:59:35.000000000 +0000
@@ -402,7 +402,7 @@
                 $command .= " -p".$db_pass;
             }
         }
-        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql";
+        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_DATA."/db/zm_update-".$version.".sql";
 
         print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
         my $output = qx($command);
--- configure.ac.orig	2006-12-27 23:55:41.000000000 +0000
+++ configure.ac	2006-12-27 23:59:07.000000000 +0000
--- configure.ac.dbinstall      2009-02-23 10:56:58.000000000 +0000
+++ configure.ac        2009-03-15 00:23:05.000000000 +0000
@@ -1,11 +1,9 @@
 AC_PREREQ(2.61)
-AC_INIT(zm,1.24.1,support at zoneminder.com,ZoneMinder)
+AC_INIT(zm,1.24.1,support at zoneminder.com,zoneminder)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/zm.h)
 AM_CONFIG_HEADER(config.h)
 
-PATH_BUILD=`pwd`
-AC_SUBST(PATH_BUILD)
 TIME_BUILD=`date +'%s'`
 AC_SUBST(TIME_BUILD)
 
@@ -318,8 +316,10 @@
 
 AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
 AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
+AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
+AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
 AC_SUBST(RUNDIR,"/var/run")
-AC_SUBST(ZM_RUNDIR,"$RUNDIR/zm")
+AC_SUBST(ZM_RUNDIR,"$RUNDIR/$PACKAGE")
 AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
 AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
 AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
--- zm.conf.in.orig	2006-12-27 23:53:38.000000000 +0000
+++ zm.conf.in	2006-12-27 23:59:11.000000000 +0000
@@ -12,8 +12,8 @@
 # Current version of ZoneMinder
 ZM_VERSION=@VERSION@
 
-# Path to build directory, used mostly for finding DB upgrade scripts
-ZM_PATH_BUILD=@PATH_BUILD@
+# Path to installed data directory, used mostly for finding DB upgrade scripts
+ZM_PATH_DATA=@PKGDATADIR@
 
 # Build time, used to record when to trigger various checks
 ZM_TIME_BUILD=@TIME_BUILD@
--- scripts/zm.in.dbinstall	2007-04-03 00:41:48.000000000 +0100
+++ scripts/zm.in	2007-04-03 00:42:46.000000000 +0100
@@ -6,10 +6,10 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-prog=ZoneMinder
+prog="@PACKAGE@"
 ZM_CONFIG="@ZM_CONFIG@"
 pidfile="@ZM_RUNDIR@"
-LOCKFILE=/var/lock/subsys/zm
+LOCKFILE=/var/lock/subsys/$prog
 
 loadconf()
 {
@@ -27,9 +27,8 @@
 start()
 {
 	zmupdate || 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
@@ -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"
+		echo "$prog is running"
 		$ZM_PATH_BIN/zmu -l
 		RETVAL=0
 	else
-		echo "ZoneMinder is stopped"
+		echo "$prog is stopped"
 		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

zoneminder-1.24.1-runlevel.patch:

--- NEW FILE zoneminder-1.24.1-runlevel.patch ---
--- scripts/zm.in.runlevel	2009-03-15 00:24:49.000000000 +0000
+++ scripts/zm.in	2009-03-15 00:28:20.000000000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
-# chkconfig: 2345 99 00
+# chkconfig: - 99 00
 # processname: zmpkg.pl
 
 # Source function library.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Mar 2009 23:59:49 -0000	1.4
+++ .cvsignore	15 Mar 2009 00:37:00 -0000	1.5
@@ -1 +1,4 @@
 ZoneMinder-1.24.1.tar.gz
+cambozola-0.68.tar.gz
+mootools-1.2-core-yc.js
+jscalendar-1.0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Mar 2009 23:59:49 -0000	1.4
+++ sources	15 Mar 2009 00:37:00 -0000	1.5
@@ -1 +1,4 @@
 1e4ce392d645cbb28037ecebc5a56584  ZoneMinder-1.24.1.tar.gz
+e4fac8b6ee94c9075b14bb95be4f860b  cambozola-0.68.tar.gz
+741c1ef4d6602c12a54d8a1b629988c8  mootools-1.2-core-yc.js
+10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip


Index: zoneminder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- zoneminder.spec	25 Feb 2009 18:44:44 -0000	1.15
+++ zoneminder.spec	15 Mar 2009 00:37:00 -0000	1.16
@@ -4,8 +4,8 @@
 %define zmgid_final apache
 
 Name: 		zoneminder
-Version: 	1.23.3
-Release: 	4%{?dist}
+Version: 	1.24.1
+Release: 	1%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -21,8 +21,8 @@
 Source4: 	README.Fedora
 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
+Patch1: 	zoneminder-1.24.1-dbinstall.patch
+Patch2:		zoneminder-1.24.1-runlevel.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
 
 Conflicts: 	zm <= 1.22.3
@@ -191,6 +191,9 @@
 
 
 %changelog
+* Sun Mar 15 2009 Martin Ebourne <martin at zepler.org> - 1.24.1-1
+- Upgrade to 1.24.1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.23.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- zoneminder-1.22.3-runlevel.patch DELETED ---


--- zoneminder-1.23.3-dbinstall.patch DELETED ---