rpms/mapserver/F-12 mapserver-php.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 import.log, 1.9, 1.10 mapserver.spec, 1.32, 1.33 sources, 1.13, 1.14

[Balint Cristian]

Author: rezso

Update of /cvs/pkgs/rpms/mapserver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24731/F-12

Modified Files:
	.cvsignore import.log mapserver.spec sources 
Added Files:
	mapserver-php.patch 
Log Message:
- fix bz#544679


mapserver-php.patch:
 php_mapscript.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE mapserver-php.patch ---
--- mapscript/php3/php_mapscript.c.orig	2010-03-18 10:33:50.000000000 +0200
+++ mapscript/php3/php_mapscript.c	2010-03-18 10:35:39.000000000 +0200
@@ -47,6 +47,15 @@
 #include <errno.h>
 #endif
 
+/* All gd functions used in this extension (if they are renamed in the
+"main/php_compat.h" file of php source) should be added here too for
+compatibility reasons: when php compiles gd as a shared extention */
+#if defined(HAVE_GD_BUNDLED)
+#undef gdImageColorExact
+#undef gdImageColorTransparent
+#undef gdImageCopy
+#endif
+
 #define PHPMS_VERSION "($Revision: 9099 $ $Date: 2009-06-08 20:39:18 -0700 (Mon, 08 Jun 2009) $)"
 
 #ifdef PHP4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	30 Aug 2009 21:07:08 -0000	1.11
+++ .cvsignore	18 Mar 2010 08:40:00 -0000	1.12
@@ -1,2 +1 @@
-mapserver-5.4.1.tar.gz
 mapserver-5.4.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/F-12/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	11 Feb 2009 16:34:12 -0000	1.9
+++ import.log	18 Mar 2010 08:40:01 -0000	1.10
@@ -7,3 +7,4 @@ mapserver-5_2_1-3_fc11:HEAD:mapserver-5.
 mapserver-5_2_1-4_fc11:HEAD:mapserver-5.2.1-4.fc11.src.rpm:1233239503
 mapserver-5_2_1-5_fc11:HEAD:mapserver-5.2.1-5.fc11.src.rpm:1233840826
 mapserver-5_2_1-6_fc11:HEAD:mapserver-5.2.1-6.fc11.src.rpm:1234369994
+mapserver-5_4_2-3_fc13:F-12:mapserver-5.4.2-3.fc13.src.rpm:1268901561


Index: mapserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/F-12/mapserver.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- mapserver.spec	13 Jan 2010 13:13:43 -0000	1.32
+++ mapserver.spec	18 Mar 2010 08:40:01 -0000	1.33
@@ -1,11 +1,12 @@
 Name:           mapserver
 Version:        5.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
 URL:            http://mapserver.gis.umn.edu
 Source:         http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
+Patch0:         %{name}-php.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       httpd
 Requires:       bitstream-vera-sans-fonts
@@ -70,6 +71,8 @@ within the Java programming language.
 
 %prep
 %setup -q
+%patch0 -p0 -b .php~
+
 # fix spurious perm bits
 chmod -x tests/home.png
 chmod -x mapscript/php3/php_mapscript.c
@@ -239,6 +242,9 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Thu Mar 18 2010 Balint Cristian <cristian.balint at gmail.com> - 5.4.2-3
+- fix bz#544679
+
 * Wed Jan 13 2010 Devrim GÜNDÜZ <devrim at gunduz.org> - 5.4.2-2
 - Rebuild against new GEOS.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	30 Aug 2009 21:07:09 -0000	1.13
+++ sources	18 Mar 2010 08:40:01 -0000	1.14
@@ -1,2 +1 @@
-4c5c6417d688eece78cadac8df96ee69  mapserver-5.4.1.tar.gz
 7c58bb90f5003fcfaec4320cc652a669  mapserver-5.4.2.tar.gz