[zoneminder] Update to 1.25.0 and fix gcc 4.7 build issues.

[Jason Tibbitts]

commit 587c797f645374e18d10538dbed8af4e82800828
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Thu Jan 19 14:15:12 2012 -0600

    Update to 1.25.0 and fix gcc 4.7 build issues.

 .gitignore                        |    1 +
 sources                           |    2 +-
 zoneminder-1.24.3-gcc44.patch     |   14 ------
 zoneminder-1.24.3-noffmpeg.patch  |   23 ----------
 zoneminder-1.24.3-v4l2.patch      |   12 -----
 zoneminder-1.24.4-dbinstall.patch |   58 --------------------------
 zoneminder-1.24.4-gcrypt.patch    |   83 -------------------------------------
 zoneminder.spec                   |   26 +++++++----
 8 files changed, 18 insertions(+), 201 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8de7cb6..1ebc556 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ ZoneMinder-1.24.2.tar.gz
 /ZoneMinder-1.24.3.tar.gz
 /zoneminder-20110324svn.tar.xz
 /ZoneMinder-1.24.4.tar.gz
+/ZoneMinder-1.25.0.tar.gz
diff --git a/sources b/sources
index be980e6..c61a1cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
-733629e1eda99be53f37c7554d169c84  ZoneMinder-1.24.4.tar.gz
+eaefa14befd482154970541252aa1a39  ZoneMinder-1.25.0.tar.gz
diff --git a/zoneminder.spec b/zoneminder.spec
index 5624fe0..22b03af 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -1,14 +1,11 @@
-#define svndate 20110324
-#define svnrev 3310
-
 %define zmuid $(id -un)
 %define zmgid $(id -gn)
 %define zmuid_final apache
 %define zmgid_final apache
 
 Name:       zoneminder
-Version:    1.24.4
-Release:    4%{?dist}
+Version:    1.25.0
+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/
@@ -26,12 +23,12 @@ Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
 # with zoneminder.  As these are javascript, there is no guideline violation
 # here.
 #Source6:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
-Patch1:     zoneminder-1.24.4-dbinstall.patch
+Patch1:     zoneminder-1.25.0-dbinstall.patch
 Patch2:     zoneminder-1.24.3-runlevel.patch
-Patch3:     zoneminder-1.24.3-noffmpeg.patch
+Patch3:     zoneminder-1.25.0-noffmpeg.patch
 Patch10:    zoneminder-1.24.4-installfix.patch
-Patch11:    zoneminder-1.24.3-gcc44.patch
-Patch12:    zoneminder-1.24.4-gcrypt.patch
+Patch11:    zoneminder-1.25.0-gcc47.patch
+Patch12:    zoneminder-1.25.0-gcrypt.patch
 
 BuildRequires:  automake gnutls-devel
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
@@ -77,7 +74,7 @@ popd
 %patch2 -p0 -b .runlevel
 %patch3 -p0 -b .noffmpeg
 %patch10 -p0 -b .installfix
-%patch11 -p0 -b .gcc44
+%patch11 -p0 -b .gcc47
 %patch12 -p0 -b .gcrypt
 cp %{SOURCE4} README.Fedora
 
@@ -90,6 +87,8 @@ OPTS=""
     OPTS="$OPTS --disable-crashtrace"
 %endif
 
+export ZM_RUNDIR=/var/run/zoneminder
+export ZM_TMPDIR=/var/lib/zoneminder/temp
 %configure \
     --with-libarch=%{_lib} \
     --with-mysql=%{_prefix} \
@@ -216,6 +215,13 @@ fi
 
 
 %changelog
+* Thu Jan 19 2012 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.25.0
+- Update to 1.25.0
+- Fix gcc4.7 build problems.
+- Drop gcc4.4 build fixes; for whatever reason they now break the build.
+- Clean up old patches.
+- Force setting of ZM_TMPDIR and ZM_RUNDIR.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.24.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild