dist-git conversion

#2781)

.cvsignore

@@ -1,4 +0,0 @@
-ZoneMinder-1.24.1.tar.gz
-cambozola-0.68.tar.gz
-mootools-1.2-core-yc.js
-jscalendar-1.0.zip

.gitignore

@@ -0,0 +1,4 @@
+cambozola-0.68.tar.gz
+jscalendar-1.0.zip
+mootools-1.2.3-core-yc.js
+ZoneMinder-1.24.2.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: zoneminder
-# $Id$
-NAME := zoneminder
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1,4 +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
+2107736d116f31767cadb15902c6c7fd  mootools-1.2.3-core-yc.js
+550d2f8f08852134028c3b1cf8fa437f  ZoneMinder-1.24.2.tar.gz

zoneminder-1.24.2-dbinstall.patch

@@ -1,5 +1,34 @@
---- db/Makefile.am.orig	2006-12-27 23:50:07.000000000 +0000
-+++ db/Makefile.am	2006-12-27 23:50:21.000000000 +0000
+diff -up ./configure.ac.dbinstall ./configure.ac
+--- ./configure.ac.dbinstall	2009-06-24 05:22:23.000000000 -0500
++++ ./configure.ac	2009-07-19 22:40:16.000000000 -0500
+@@ -1,11 +1,9 @@
+ AC_PREREQ(2.59)
+-AC_INIT(zm,1.24.2,support@zoneminder.com,ZoneMinder)
++AC_INIT(zm,1.24.2,support@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)
+ 
+@@ -319,8 +317,10 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+ 
+ 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")
+diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
+--- ./db/Makefile.am.dbinstall	2009-03-31 09:06:34.000000000 -0500
++++ ./db/Makefile.am	2009-07-19 22:27:02.000000000 -0500
 @@ -1,7 +1,16 @@
  AUTOMAKE_OPTIONS = gnu
  
@@ -17,61 +46,9 @@
  	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@zoneminder.com,ZoneMinder)
-+AC_INIT(zm,1.24.1,support@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
+diff -up ./scripts/zm.in.dbinstall ./scripts/zm.in
+--- ./scripts/zm.in.dbinstall	2009-03-20 07:07:02.000000000 -0500
++++ ./scripts/zm.in	2009-07-19 22:27:02.000000000 -0500
 @@ -6,10 +6,10 @@
  # Source function library.
  . /etc/rc.d/init.d/functions
@@ -85,7 +62,7 @@
  
  loadconf()
  {
-@@ -27,9 +27,8 @@
+@@ -27,9 +27,8 @@ command="$ZM_PATH_BIN/zmpkg.pl"
  start()
  {
  	zmupdate || return $?
@@ -96,7 +73,7 @@
  		&& 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 @@
+@@ -56,7 +55,6 @@ start()
  
  stop()
  {
@@ -104,7 +81,7 @@
  	echo -n $"Stopping $prog: "
  	$command stop
  	RETVAL=$?
-@@ -60,22 +58,21 @@
+@@ -67,22 +65,21 @@ stop()
  
  zmstatus()
  {
@@ -131,7 +108,7 @@
  	fi
  }
  
-@@ -92,7 +89,6 @@
+@@ -99,7 +96,6 @@ case "$1" in
  		start
  		;;
  	'condrestart')
@@ -139,3 +116,28 @@
  		result=`$ZM_PATH_BIN/zmdc.pl check`
  		if [ "$result" = "running" ]; then
  			$ZM_PATH_BIN/zmdc.pl shutdown > /dev/null
+--- ./scripts/zmupdate.pl.in.dbinstall	2009-06-30 02:42:12.000000000 -0500
++++ ./scripts/zmupdate.pl.in	2009-07-19 22:27:02.000000000 -0500
+@@ -403,7 +403,7 @@ if ( $version )
+                 $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);
+diff -up ./zm.conf.in.dbinstall ./zm.conf.in
+--- ./zm.conf.in.dbinstall	2009-03-20 07:07:10.000000000 -0500
++++ ./zm.conf.in	2009-07-19 22:27:02.000000000 -0500
+@@ -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@

zoneminder-1.24.2-gcc44.patch

@@ -1,7 +1,7 @@
---- src/zm_utils.cpp.gcc44      2008-07-25 10:33:24.000000000 +0100
-+++ src/zm_utils.cpp    2009-04-07 21:25:05.000000000 +0100
-@@ -19,7 +19,8 @@
- 
+--- src/zm_utils.cpp.gcc44	2009-05-28 03:47:59.000000000 -0500
++++ src/zm_utils.cpp	2009-07-20 00:28:43.000000000 -0500
+@@ -20,7 +20,8 @@
+ //#include "zm_debug.h"
  #include "zm_utils.h"
  
 -#include <stdarg.h>
@@ -10,14 +10,14 @@
  
  const std::string stringtf( const char *format, ... )
  {
---- src/Makefile.am.frepo	2009-04-11 02:08:57.000000000 +0100
-+++ src/Makefile.am	2009-04-11 02:09:07.000000000 +0100
+--- src/Makefile.am.frepo       2009-04-11 02:08:57.000000000 +0100
++++ src/Makefile.am     2009-04-11 02:09:07.000000000 +0100
 @@ -1,7 +1,7 @@
  AUTOMAKE_OPTIONS = gnu
- 
+
  AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
 -AM_CXXFLAGS = -frepo
 +#AM_CXXFLAGS = -frepo
- 
+
  CLEANFILES = *.rpo
- 
+

zoneminder-1.24.2-noffmpeg.patch

@@ -1,6 +1,6 @@
---- configure.ac.noffmpeg	2009-04-11 02:15:30.000000000 +0100
-+++ configure.ac	2009-04-11 02:15:52.000000000 +0100
-@@ -245,10 +245,10 @@
+--- configure.ac.noffmpeg	2009-07-20 00:24:37.000000000 -0500
++++ configure.ac	2009-07-20 00:25:51.000000000 -0500
+@@ -244,10 +244,10 @@
  AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
  fi
  AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
@@ -13,5 +13,5 @@
 +dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming),[-lavcodec -lavutil])
 +dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
  AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
+ AC_CHECK_LIB(z,compress,,)
  
- # Checks for header files.

zoneminder.spec

@@ -3,16 +3,16 @@
 %define zmuid_final apache
 %define zmgid_final apache
 
-Name: 		zoneminder
-Version: 	1.24.1
-Release: 	3%{?dist}
-Summary:        A camera monitoring and analysis tool
-Group:          System Environment/Daemons
+Name:       zoneminder
+Version:    1.24.2
+Release:    2%{?dist}
+Summary:    A camera monitoring and analysis tool
+Group:      System Environment/Daemons
 # 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)
+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
 Source1: 	http://www.charliemouse.com/code/cambozola/cambozola-0.68.tar.gz
@@ -20,13 +20,13 @@ Source2: 	zoneminder.conf
 Source3: 	redalert.wav
 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.24.1-dbinstall.patch
+Source6:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
+Patch1: 	zoneminder-1.24.2-dbinstall.patch
 Patch2:		zoneminder-1.24.1-runlevel.patch
-Patch3:		zoneminder-1.24.1-noffmpeg.patch
+Patch3:		zoneminder-1.24.2-noffmpeg.patch
 Patch4:		zoneminder-1.24.1-perldep.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
-Patch11: 	zoneminder-1.24.1-gcc44.patch
+Patch11: 	zoneminder-1.24.2-gcc44.patch
 
 Conflicts: 	zm <= 1.22.3
 
@@ -37,9 +37,12 @@ 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)
+Requires: 	perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
+Requires:   perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
+
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -133,8 +136,8 @@ 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
+install -m 644 %{SOURCE6} mootools-1.2.3-core-yc.js
+ln -s mootools-1.2.3-core-yc.js mootools.js
 popd
 
 %clean
@@ -197,6 +200,16 @@ fi
 
 
 %changelog
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-2
+- Bump release since 1.24.2-1 was mistakenly tagged a few months ago.
+
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-1
+- Initial update to 1.24.2.
+- Rebase patches.
+- Update mootools download location.
+- Update to mootools 1.2.3.
+- Add additional dependencies for some optional features.
+
 * Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-3
 - Remove unused Sys::Mmap perl dependency RPM is finding