From f44e46ba024b154c0933863d5e15b52d5b974c24 Mon Sep 17 00:00:00 2001
From: Oliver Falk <oliver@fedoraproject.org>
Date: Thu, 30 Aug 2007 10:12:48 +0000
Subject: [PATCH] - Add fix to include libmapserver (in some places), instead
 of libmap, that     doesn't exist (anymore)

---
 mapserver-4.10.3-ldfix.patch | 25 +++++++++++++++++++++++++
 mapserver.spec               |  8 +++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 mapserver-4.10.3-ldfix.patch

diff --git a/mapserver-4.10.3-ldfix.patch b/mapserver-4.10.3-ldfix.patch
new file mode 100644
index 0000000..3e174f7
--- /dev/null
+++ b/mapserver-4.10.3-ldfix.patch
@@ -0,0 +1,25 @@
+--- mapserver-4.10.3/mapscript/java/Makefile.in.ldfix	2007-08-30 11:59:03.000000000 +0200
++++ mapserver-4.10.3/mapscript/java/Makefile.in	2006-08-27 18:41:36.000000000 +0200
+@@ -184,9 +184,9 @@ SUP_LIBS =  $(GD_LIB) $(PDF_LIB) $(TIFF_
+ # STATIC_LIBS is full filename with path of libs that will be statically linked
+ STATIC_LIBS= $(GD_STATIC)
+ 
+-EXE_LDFLAGS =	$(RUNPATHS) -L. -lmap $(SUP_LIBS) $(STATIC_LIBS)
++EXE_LDFLAGS =	$(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
+ 
+-LDFLAGS= $(RUNPATHS) -L../.. -lmap $(SUP_LIBS) $(STATIC_LIBS)
++LDFLAGS= $(RUNPATHS) -L../.. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
+ 
+ # END OF CONFIGURE----
+ 
+--- mapserver-4.10.3/mapscript/csharp/Makefile.in.ldfix	2007-08-30 11:58:29.000000000 +0200
++++ mapserver-4.10.3/mapscript/csharp/Makefile.in	2007-08-30 11:58:42.000000000 +0200
+@@ -188,7 +188,7 @@ SUP_LIBS =  $(GD_LIB) $(PDF_LIB) $(TIFF_
+ # STATIC_LIBS is full filename with path of libs that will be statically linked
+ STATIC_LIBS= $(GD_STATIC)
+ 
+-LDFLAGS= $(RUNPATHS) -L../.. -lmap $(SUP_LIBS) $(STATIC_LIBS)
++LDFLAGS= $(RUNPATHS) -L../.. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
+ 
+ LIBMAPSCRIPT_SHARED= libmapscript.@SO_EXT@
+ LD_SHARED= @LD_SHARED@
diff --git a/mapserver.spec b/mapserver.spec
index dccf7b6..9961e1e 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -1,11 +1,12 @@
 Name:           mapserver
 Version:        4.10.3
-Release:        1%{?dist}
+Release:        2%{?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}-%{version}-ldfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       httpd 
 BuildRequires:  libXpm-devel
@@ -67,6 +68,7 @@ within the Java programming language.
 
 %prep
 %setup -q
+%patch0 -p1
 # fix spurious perm bits
 chmod -x tests/home.png
 chmod -x rfc/ms-rfc-8.txt
@@ -218,6 +220,10 @@ rm -rf %{buildroot}
 %{_javadir}/*.jar
 
 %changelog
+* Thu Aug 30 2007 Oliver Falk <oliver@linux-kernel.at> 4.10.3-2
+- Add fix to include libmapserver (in some places), instead of
+  libmap, that doesn't exist (anymore)
+
 * Thu Aug 30 2007 Oliver Falk <oliver@linux-kernel.at> 4.10.3-1
 - Update to fix bz#256561, CVE-2007-4542