Merge branch 'master' into f16

Conflicts: zoneminder-1.24.4-gcrypt.patch zoneminder.spec
2011-09-15 18:24:35 -05:00 · 2011-09-15 18:10:38 -05:00 · 2011-08-26 16:47:55 -04:00 · 2011-08-26 16:32:25 -04:00
1 changed files with 4 additions and 0 deletions
--- a/zoneminder.spec
+++ b/zoneminder.spec
@ -231,8 +231,12 @@ fi
 - Upstream changed the tarball without changing the version to patch a
  vulnerability, so redownload.
 * Fri Aug 26 2011 Tom Callaway <spot@fedoraproject.org> - 1.24.3-8.20110324svn3310
 - bump for gnutls
 * Sun Aug 14 2011 Jason L Tibbitts III <tibbs@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.
Author	SHA1	Message	Date
Jason Tibbitts	820d8b737e	Merge branch 'master' into f16	2011-09-15 18:24:35 -05:00
Jason Tibbitts	c78b696849	Merge branch 'master' into f16 Conflicts: zoneminder-1.24.4-gcrypt.patch zoneminder.spec	2011-09-15 18:10:38 -05:00
Tom "spot" Callaway	58aa9f120a	use patch from rawhide	2011-08-26 16:47:55 -04:00
Tom "spot" Callaway	68f3c31c2a	rebuild for gnutls dep	2011-08-26 16:32:25 -04:00