rpms/zoneminder/devel zoneminder-1.22.3-gcc43.patch, NONE, 1.1 zoneminder.spec, 1.6, 1.7

[Martin Ebourne (mebourne)]

Author: mebourne

Update of /cvs/pkgs/rpms/zoneminder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27941

Modified Files:
	zoneminder.spec 
Added Files:
	zoneminder-1.22.3-gcc43.patch 
Log Message:
* Thu Jan  3 2008 Martin Ebourne <martin at zepler.org> - 1.22.3-11
- Fix compilation on gcc 4.3


zoneminder-1.22.3-gcc43.patch:

--- NEW FILE zoneminder-1.22.3-gcc43.patch ---
--- src/zm_image.h.orig	2008-01-03 23:56:32.000000000 +0000
+++ src/zm_image.h	2008-01-03 23:56:20.000000000 +0000
@@ -249,7 +249,7 @@
 	bool Unzip( const Bytef *inbuffer, unsigned long inbuffer_size );
 	bool Zip( Bytef *outbuffer, unsigned long *outbuffer_size, int compression_level=Z_BEST_SPEED ) const;
 
-	bool Crop( int lo_x, int lo_y, int hi_y, int hi_y );
+	bool Crop( int lo_x, int lo_y, int hi_x, int hi_y );
 
 	void Overlay( const Image &image );
 	void Blend( const Image &image, int transparency=10 ) const;


Index: zoneminder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- zoneminder.spec	6 Dec 2007 22:14:44 -0000	1.6
+++ zoneminder.spec	4 Jan 2008 00:01:45 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name: 		zoneminder
 Version: 	1.22.3
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 License:        GPLv2+
@@ -19,6 +19,7 @@
 Source4: 	README.Fedora
 Patch1: 	zoneminder-1.22.3-dbinstall.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
+Patch11:	zoneminder-1.22.3-gcc43.patch
 
 Conflicts: 	zm <= 1.22.3
 
@@ -50,6 +51,7 @@
 %setup -q -n ZoneMinder-%{version}
 %patch1 -p0 -b .dbinstall
 %patch10 -p0 -b .installfix
+%patch11 -p0 -b .gcc43
 gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar
 cp %{SOURCE4} README.Fedora
 
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Thu Jan  3 2008 Martin Ebourne <martin at zepler.org> - 1.22.3-11
+- Fix compilation on gcc 4.3
+
 * Thu Dec  6 2007 Martin Ebourne <martin at zepler.org> - 1.22.3-10
 - Rebuild for new openssl