packages: zoneminder/zm-fedora.patch - regenerated for 1.25.0

[hawk]

Author: hawk                         Date: Fri Dec 16 11:24:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- regenerated for 1.25.0

---- Files affected:
packages/zoneminder:
   zm-fedora.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/zoneminder/zm-fedora.patch
diff -u packages/zoneminder/zm-fedora.patch:1.7 packages/zoneminder/zm-fedora.patch:1.8
--- packages/zoneminder/zm-fedora.patch:1.7	Mon May 30 22:33:02 2011
+++ packages/zoneminder/zm-fedora.patch	Fri Dec 16 12:24:07 2011
@@ -1,11 +1,7 @@
-diff -up ./configure.ac.dbinstall ./configure.ac
---- ./configure.ac.dbinstall	2011-02-15 15:59:06.000000000 -0600
-+++ ./configure.ac	2011-03-24 22:50:36.615225107 -0500
-@@ -1,11 +1,9 @@
- AC_PREREQ(2.59)
--AC_INIT(zm,1.24.4,support at zoneminder.com,ZoneMinder,http://www.zoneminder.com/downloads.html)
-+AC_INIT(zm,1.24.4,support at zoneminder.com,ZoneMinder,http://www.zoneminder.com/downloads.html)
- AM_INIT_AUTOMAKE
+diff -ur ZoneMinder-1.25.0.orig//configure.ac ZoneMinder-1.25.0/configure.ac
+--- ZoneMinder-1.25.0.orig//configure.ac	2011-08-23 15:10:32.000000000 +0000
++++ ZoneMinder-1.25.0/configure.ac	2011-12-14 13:55:39.783022708 +0000
+@@ -4,8 +4,6 @@
  AC_CONFIG_SRCDIR(src/zm.h)
  AM_CONFIG_HEADER(config.h)
  
@@ -14,7 +10,7 @@
  TIME_BUILD=`date +'%s'`
  AC_SUBST(TIME_BUILD)
  
-@@ -354,6 +352,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+@@ -358,6 +356,8 @@
  
  AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
  AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
@@ -23,9 +19,9 @@
  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-10-14 04:42:46.000000000 -0500
-+++ ./db/Makefile.am	2011-03-24 22:50:14.173912137 -0500
+diff -ur ZoneMinder-1.25.0.orig//db/Makefile.am ZoneMinder-1.25.0/db/Makefile.am
+--- ZoneMinder-1.25.0.orig//db/Makefile.am	2011-06-21 07:40:11.000000000 +0000
++++ ZoneMinder-1.25.0/db/Makefile.am	2011-12-14 13:55:26.783165035 +0000
 @@ -1,7 +1,16 @@
  AUTOMAKE_OPTIONS = gnu
  
@@ -43,10 +39,10 @@
  	zm_update-0.0.1.sql \
  	zm_update-0.9.7.sql \
  	zm_update-0.9.8.sql \
-diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in
---- ./scripts/zmupdate.pl.in.dbinstall	2011-01-17 12:21:37.000000000 -0600
-+++ ./scripts/zmupdate.pl.in	2011-03-24 22:50:14.174912107 -0500
-@@ -428,7 +428,7 @@
+diff -ur ZoneMinder-1.25.0.orig//scripts/zmupdate.pl.in ZoneMinder-1.25.0/scripts/zmupdate.pl.in
+--- ZoneMinder-1.25.0.orig//scripts/zmupdate.pl.in	2011-08-26 07:51:37.000000000 +0000
++++ ZoneMinder-1.25.0/scripts/zmupdate.pl.in	2011-12-14 13:55:26.784133435 +0000
+@@ -424,7 +424,7 @@
          }
          else
          {
@@ -55,9 +51,9 @@
          }
          $command .= "/zm_update-".$version.".sql";
  
-diff -up ./zm.conf.in.dbinstall ./zm.conf.in
---- ./zm.conf.in.dbinstall	2008-07-25 04:48:16.000000000 -0500
-+++ ./zm.conf.in	2011-03-24 22:50:14.175912077 -0500
+diff -ur ZoneMinder-1.25.0.orig//zm.conf.in ZoneMinder-1.25.0/zm.conf.in
+--- ZoneMinder-1.25.0.orig//zm.conf.in	2008-07-25 09:48:17.000000000 +0000
++++ ZoneMinder-1.25.0/zm.conf.in	2011-12-14 13:55:26.784133435 +0000
 @@ -12,8 +12,8 @@
  # Current version of ZoneMinder
  ZM_VERSION=@VERSION@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zoneminder/zm-fedora.patch?r1=1.7&r2=1.8&f=u