diff --git a/mapserver.spec b/mapserver.spec index 851f63f..9536037 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -63,7 +63,7 @@ BuildRequires: krb5-devel BuildRequires: libgcj-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Patch0: mapserver-5.4.1_buildchecks.patch -#Patch1: hidden_layer.patch +Patch1: patch_3877-r11714.patch #Patch2: bug3525_verbose_output.patch %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") @@ -115,7 +115,7 @@ within the Java programming language. %prep %setup -q -n %{name}-%{fileversion} %patch0 -p1 -#%patch1 -p1 +%patch1 -p0 #%patch2 -p1 # fix spurious perm bits @@ -289,6 +289,8 @@ rm -rf %{buildroot} %{_javadir}/*.jar %changelog +* Fri May 27 2011 Stephan Holl 6.0.0 +- included the patch from #3877 to make it build * Mon May 16 2011 Stephan Holl 6.0.0 - updated to new upstream version of mapserver 6.0.0 (see http://trac.osgeo.org/mapserver/browser/tags/rel-6-0-0/mapserver/HISTORY.TXT for a detailed description of the changes. diff --git a/patch_3877-r11714.patch b/patch_3877-r11714.patch new file mode 100644 index 0000000..c6b6320 --- /dev/null +++ b/patch_3877-r11714.patch @@ -0,0 +1,36 @@ +Index: mapserver-6.0.0/HISTORY.TXT +=================================================================== +--- mapserver-6.0.0/HISTORY.TXT (revision 11709) ++++ mapserver-6.0.0/HISTORY.TXT (revision 11714) +@@ -15,4 +15,6 @@ + Version 6.0.1 (SVN branch-6-0): + --------------------------- ++ ++- Fixed the build problem in mapunion.c (#3877) + + - Union layer: Fixed the crash when styling source layers using attributes (#3870) +Index: mapserver-6.0.0/mapunion.c +=================================================================== +--- mapserver-6.0.0/mapunion.c (revision 11709) ++++ mapserver-6.0.0/mapunion.c (revision 11714) +@@ -316,5 +316,5 @@ + /* get items requested by the union layer plus the required items */ + msLayerSetProcessingKey(srclayer, "ITEMS", itemlist); +- if (msLayerWhichItems(srclayer, TRUE, NULL) != MS_SUCCESS) ++ if (msLayerWhichItems(srclayer, MS_TRUE, NULL) != MS_SUCCESS) + { + msFree(itemlist); +@@ -325,5 +325,5 @@ + { + /* get only the required items */ +- if (msLayerWhichItems(srclayer, FALSE, NULL) != MS_SUCCESS) ++ if (msLayerWhichItems(srclayer, MS_FALSE, NULL) != MS_SUCCESS) + return MS_FAILURE; + } +@@ -354,5 +354,5 @@ + + /* get only the required items */ +- if (msLayerWhichItems(srclayer, FALSE, NULL) != MS_SUCCESS) ++ if (msLayerWhichItems(srclayer, MS_FALSE, NULL) != MS_SUCCESS) + return MS_FAILURE; + }