rpms/zoneminder/F-11 zoneminder-1.24.2-dbinstall.patch, NONE, 1.1 zoneminder-1.24.2-gcc44.patch, NONE, 1.1 zoneminder-1.24.2-noffmpeg.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 zoneminder.spec, 1.21, 1.22 zoneminder-1.24.1-dbinstall.patch, 1.1, NONE zoneminder-1.24.1-gcc44.patch, 1.3, NONE zoneminder-1.24.1-noffmpeg.patch, 1.1, NONE
Jason ティビツ
tibbs at fedoraproject.org
Wed Jul 22 20:12:18 UTC 2009
Author: tibbs
Update of /cvs/extras/rpms/zoneminder/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26450
Modified Files:
.cvsignore sources zoneminder.spec
Added Files:
zoneminder-1.24.2-dbinstall.patch
zoneminder-1.24.2-gcc44.patch zoneminder-1.24.2-noffmpeg.patch
Removed Files:
zoneminder-1.24.1-dbinstall.patch
zoneminder-1.24.1-gcc44.patch zoneminder-1.24.1-noffmpeg.patch
Log Message:
* Wed Jul 22 2009 Jason L Tibbitts III <tibbs at 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.
zoneminder-1.24.2-dbinstall.patch:
configure.ac | 8 ++++----
db/Makefile.am | 9 +++++++++
scripts/zm.in | 18 +++++++-----------
scripts/zmupdate.pl.in | 2 +-
zm.conf.in | 4 ++--
5 files changed, 23 insertions(+), 18 deletions(-)
--- NEW FILE zoneminder-1.24.2-dbinstall.patch ---
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 at zoneminder.com,ZoneMinder)
+AC_INIT(zm,1.24.2,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)
@@ -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
+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 \
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
-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 @@ command="$ZM_PATH_BIN/zmpkg.pl"
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
@@ -56,7 +55,6 @@ start()
stop()
{
- loadconf
echo -n $"Stopping $prog: "
$command stop
RETVAL=$?
@@ -67,22 +65,21 @@ stop()
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
}
@@ -99,7 +96,6 @@ case "$1" in
start
;;
'condrestart')
- loadconf
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:
Makefile.am | 2 +-
zm_utils.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE zoneminder-1.24.2-gcc44.patch ---
--- 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>
+#include <cstdio>
+#include <cstdarg>
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
@@ -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:
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE zoneminder-1.24.2-noffmpeg.patch ---
--- 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))
-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
-AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming),[-lavcodec -lavutil])
-AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+dnl AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+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,,)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zoneminder/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 15 Mar 2009 00:37:00 -0000 1.5
+++ .cvsignore 22 Jul 2009 20:11:47 -0000 1.6
@@ -1,4 +1,4 @@
-ZoneMinder-1.24.1.tar.gz
cambozola-0.68.tar.gz
-mootools-1.2-core-yc.js
jscalendar-1.0.zip
+mootools-1.2.3-core-yc.js
+ZoneMinder-1.24.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zoneminder/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 15 Mar 2009 00:37:00 -0000 1.5
+++ sources 22 Jul 2009 20:11:47 -0000 1.6
@@ -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
Index: zoneminder.spec
===================================================================
RCS file: /cvs/extras/rpms/zoneminder/F-11/zoneminder.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- zoneminder.spec 11 Apr 2009 18:03:48 -0000 1.21
+++ zoneminder.spec 22 Jul 2009 20:11:47 -0000 1.22
@@ -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: 1%{?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(D
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%
# 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,13 @@ fi
%changelog
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs at 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 at zepler.org> - 1.24.1-3
- Remove unused Sys::Mmap perl dependency RPM is finding
--- zoneminder-1.24.1-dbinstall.patch DELETED ---
--- zoneminder-1.24.1-gcc44.patch DELETED ---
--- zoneminder-1.24.1-noffmpeg.patch DELETED ---
More information about the fedora-extras-commits
mailing list