rpms/mapserver/devel mapserver-4.10.3-ldfix.patch, NONE, 1.1 mapserver.spec, 1.3, 1.4
Oliver Falk (oliver)
fedora-extras-commits at redhat.com
Thu Aug 30 10:13:21 UTC 2007
Author: oliver
Update of /cvs/pkgs/rpms/mapserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23790
Modified Files:
mapserver.spec
Added Files:
mapserver-4.10.3-ldfix.patch
Log Message:
* Thu Aug 30 2007 Oliver Falk <oliver at linux-kernel.at> 4.10.3-2
- Add fix to include libmapserver (in some places), instead of
libmap, that doesn't exist (anymore)
mapserver-4.10.3-ldfix.patch:
--- NEW FILE mapserver-4.10.3-ldfix.patch ---
--- 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. at SO_EXT@
LD_SHARED= @LD_SHARED@
Index: mapserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mapserver.spec 30 Aug 2007 08:33:14 -0000 1.3
+++ mapserver.spec 30 Aug 2007 10:12:48 -0000 1.4
@@ -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 @@
%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 @@
%{_javadir}/*.jar
%changelog
+* Thu Aug 30 2007 Oliver Falk <oliver at 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 at linux-kernel.at> 4.10.3-1
- Update to fix bz#256561, CVE-2007-4542
More information about the fedora-extras-commits
mailing list