[zoneminder/f16: 6/6] Merge branch 'master' into f16

[Jason Tibbitts]

commit c78b696849ae3325de1f9485b56d786498d4dcdf
Merge: 58aa9f1 131373e
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Thu Sep 15 18:10:38 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	zoneminder-1.24.4-gcrypt.patch
    	zoneminder.spec

 .gitignore                         |    1 +
 README.Fedora                      |   58 +++++++++++++++++++++++----
 sources                            |    3 +-
 zoneminder-1.24.1-perldep.patch    |   12 ------
 zoneminder-1.24.3-dbinstall.patch  |   71 ---------------------------------
 zoneminder-1.24.3-installfix.patch |   18 --------
 zoneminder-1.24.4-dbinstall.patch  |   58 +++++++++++++++++++++++++++
 zoneminder-1.24.4-gcrypt.patch     |   34 ++++++++++++----
 zoneminder-1.24.4-installfix.patch |   22 ++++++++++
 zoneminder.spec                    |   77 ++++++++++++++++++++++--------------
 10 files changed, 204 insertions(+), 150 deletions(-)
---
diff --cc zoneminder.spec
index 616e8ba,b8f5ad2..ad6773b
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@@ -215,8 -216,20 +216,24 @@@ f
  
  
  %changelog
+ * Thu Sep 15 2011 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.24.4-2
+ - Add patch for bug 711780 - fix syntax issue in Mapped.pm.
+ - Undo that patch, and undo another which was the cause of the whole mess.
+ - Fix up other patches so ZM_PATH_BUILD is both defined and useful.
+ - Make sure database creation mods actually take.
+ - Update Fedora-specific docs with some additional info.
+ - Use bundled mootools (javascript, so no guideline violation).
+ - Update download location.
+ - Update the gcrypt patch to actually work.
+ - Upstream changed the tarball without changing the version to patch a
+   vulnerability, so redownload.
+ 
 +* Fri Aug 26 2011 Tom Callaway <spot at fedoraproject.org> - 1.24.3-8.20110324svn3310
 +- bump for gnutls
++
+ * Sun Aug 14 2011 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.24.4-1
+ - Initial attempt to upgrade to 1.24.4.
++
  - Add patch from BZ 460310 to build against libgcrypt instead of requiring the
    gnutls openssl libs.