rpms/mapserver
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add fix to include libmapserver (in some places), instead of libmap, that

Browse Source 
doesn't exist (anymore)
This commit is contained in:
Oliver Falk 2007-08-30 10:12:48 +00:00
parent 1184b345a7
commit f44e46ba02
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mapserver-4.10.3-ldfix.patch Normal file
View File

@ -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@

8
mapserver.spec
View File

@ -1,11 +1,12 @@
Name: mapserver Name: mapserver
Version: 4.10.3 Version: 4.10.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: Environment for building spatially-enabled internet applications Summary: Environment for building spatially-enabled internet applications
Group: Development/Tools Group: Development/Tools
License: BSD License: BSD
URL: http://mapserver.gis.umn.edu URL: http://mapserver.gis.umn.edu
Source: http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz Source: http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
Patch0: %{name}-%{version}-ldfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: httpd Requires: httpd
BuildRequires: libXpm-devel BuildRequires: libXpm-devel
@ -67,6 +68,7 @@ within the Java programming language.
%prep %prep
%setup -q %setup -q
%patch0 -p1
# fix spurious perm bits # fix spurious perm bits
chmod -x tests/home.png chmod -x tests/home.png
chmod -x rfc/ms-rfc-8.txt chmod -x rfc/ms-rfc-8.txt
@ -218,6 +220,10 @@ rm -rf %{buildroot}
%{_javadir}/*.jar %{_javadir}/*.jar
%changelog %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 * Thu Aug 30 2007 Oliver Falk <oliver@linux-kernel.at> 4.10.3-1
- Update to fix bz#256561, CVE-2007-4542 - Update to fix bz#256561, CVE-2007-4542