jengelh/mapserver
SHA256
1
0
Fork 0
forked from pool/mapserver
Code Pull Requests Activity

Accepting request 141314 from home:tzotsos:Application:Geo

Browse Source 
Updated to 6.2.0 stable release

OBS-URL: https://build.opensuse.org/request/show/141314
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=93
This commit is contained in:
Angelos Tzotsos 2012-11-14 15:45:22 +00:00 committed by Git OBS Bridge
parent f5ed65649e
commit cf9e22decb
5 changed files with 152 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mapserver-6.0.2_buildfix.patch
View File

@ -1,15 +0,0 @@
diff -ur mapserver-6.0.1/mapogr.cpp mapserver-6.0.1f/mapogr.cpp
--- mapserver-6.0.1/mapogr.cpp 2011-07-12 15:06:14.000000000 +0200
+++ mapserver-6.0.1f/mapogr.cpp 2011-11-23 16:06:53.000000000 +0100
@@ -3719,9 +3719,9 @@
msSetError(MS_MISCERR, "OGR support is not available.",
"msOGREscapeSQLParam()");
- return NULL;
-
#endif /* USE_OGR */
+
+ return NULL;
}

3
mapserver-6.0.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a939d5e207017ff87e115816a0a8a13fb2751069feb90e12fe594c537a917199
size 2439456

3
mapserver-6.2.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:93eb52d659b58499939b609ac77f35dc8c862ca88db9e27de48476e9b766e392
size 2806026

46
mapserver.changes
View File

@ -1,7 +1,49 @@
-------------------------------------------------------------------
Mon Oct 8 18:50:12 UTC 2012 - tzotsos@opensuse.org
Wed Nov 14 15:29:11 UTC 2012 - tzotsos@opensuse.org
- Disabled Java build due to openJDK7 failures
- Update to v6.2.0
Major new features:
MapServer Suite
INSPIRE View Services
Mask Layers
Precise Symbol Placement
Complex Multi Label/Symbol Symbology
Vector Fields
Label Leader Offsetting
SVG Symbology
Multiple Font Support
-------------------------------------------------------------------
Fri Oct 12 16:58:00 UTC 2012 - tzotsos@opensuse.org
- Update to v6.2rc1
- Enabled perl and java packages
-------------------------------------------------------------------
Thu Sep 27 21:20:46 UTC 2012 - tzotsos@opensuse.org
- Update to v6.2beta4
-------------------------------------------------------------------
Thu Sep 6 18:41:56 UTC 2012 - tzotsos@opensuse.org
- Update to v6.2beta3
-------------------------------------------------------------------
Sat Jul 7 18:05:14 UTC 2012 - tzotsos@opensuse.org
- Update to v6.2beta1
-------------------------------------------------------------------
Tue Jun 26 12:17:45 UTC 2012 - tzotsos@opensuse.org
- Enabled Python
-------------------------------------------------------------------
Fri Jun 22 14:20:04 UTC 2012 - tzotsos@opensuse.org
- testing 6.1.dev version
TODO: Add support for Python, Perl, Java
-------------------------------------------------------------------
Tue May 22 19:56:53 UTC 2012 - tzotsos@opensuse.org

130
mapserver.spec
View File

@ -1,9 +1,9 @@
Name: mapserver
%define fileversion 6.0.3
Version: 6.0.3
%define fileversion 6.2.0
Version: 6.2.0
Release: 1
License: BSD
Group: Applications/GIS
Group: Productivity/Scientific/Other
Source: %{name}-%{fileversion}.tar.gz
Url: http://www.mapserver.org
Summary: Environment for building spatially-enabled internet applications
@ -16,7 +16,10 @@ Requires: apache2
%if 0%{?suse_version} != 1010
BuildRequires: xorg-x11-libXpm-devel
%endif
BuildRequires: rpm, gcc, gcc-c++, pam
BuildRequires: rpm
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: pam
BuildRequires: pam-devel
BuildRequires: postgresql-devel
BuildRequires: libexpat-devel
@ -27,9 +30,11 @@ BuildRequires: libproj-devel
BuildRequires: libgdal-devel
BuildRequires: readline-devel
BuildRequires: freetype2-devel
BuildRequires: gd-devel >= 2.0.16
BuildRequires: FastCGI-devel
BuildRequires: python-devel
BuildRequires: fribidi-devel
BuildRequires: cairo-devel
BuildRequires: gd-devel >= 2.0.16
%if 0%{?suse_version} >= 1030
BuildRequires: libcurl-devel
BuildRequires: php-devel
@ -64,9 +69,7 @@ BuildRequires: java-1_5_0-ibm-alsa
BuildRequires: krb5-devel
%endif
BuildRequires: libgcj-devel
BuildRequires: patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Patch: mapserver-6.0.2_buildfix.patch
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
%define _cgibindir /srv/www/cgi-bin
@ -107,53 +110,64 @@ Requires: python-base
The Python/Mapscript extension provides full map customization capabilities
within the Python programming language.
#%package java
#Summary: Java/Mapscript map making extensions to Java
#Group: Development/Languages
#Requires: %{name} = %{version}-%{release}
%package java
Summary: Java/Mapscript map making extensions to Java
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
#%description java
#The Java/Mapscript extension provides full map customization capabilities
#within the Java programming language.
%description java
The Java/Mapscript extension provides full map customization capabilities
within the Java programming language.
%prep
%setup -q -n %{name}-%{fileversion}
%patch -p1
%build
%build -n %{name}-%{fileversion}
%configure XTRALIBS=-ldl \
--with-gd \
--with-zlib \
--with-freetype=%{_bindir}/freetype-config \
--with-fribidi-config \
--with-gdal=%{_bindir}/gdal-config \
--with-ogr=%{_bindir}/gdal-config \
--with-geos=%{_bindir}/geos-config \
--with-proj \
--with-sos \
--with-wms \
--with-wfs \
--with-wcs \
--with-wmsclient \
--with-wfsclient \
--with-xpm \
--with-png \
--with-cairo \
--with-postgis=%{_bindir}/pg_config \
--with-mygis=%{_bindir}/mysql_config \
--with-curl-config=%{_bindir}/curl-config \
--with-xml2-config=%{_bindir}/xml2-config \
--with-php=`php-config --include-dir` \
--with-xslt-config=%{_bindir}/xslt-config \
--with-php=%{_bindir}/php-config \
--with-httpd=/usr/sbin/httpd2 \
--with-fastcgi=/usr \
--with-agg-svg-symbols=yes \
--with-expat=/usr \
--with-kml=yes \
--with-xml-mapfile \
--without-pdf \
--without-eppl \
--with-threads \
--enable-python-mapscript \
--disable-runpath
## WARNING !!!
# using %{?_smp_mflags} may break build
make
# temporary hack!
make mapscriptvars
#sed -i -e "s;libdir='%{_libdir}';libdir='%{buildroot}%{_libdir}';" libmapserver.la
#sed -i -e "s;libdir='%{python_sitearch}';libdir='%{buildroot}%{python_sitearch}';" mapscript/python/_mapscript.la
#sed -i -e "s;libdir='/usr/lib64/php/modules';libdir='%{buildroot}/usr/lib64/php/modules';" mapscript/php/php_mapscript.la
## build perl
cd mapscript/perl
@ -161,13 +175,16 @@ perl Makefile.PL
make
## build python
cd ../python
python setup.py build
#cd ../python
#python setup.py build
# build java
#cd ../java
#touch ../mapscript.i
cd ../java
#JAVA_HOME=%{java_home} make
#sed -i -e "s;libdir='%{_libdir}';libdir='%{buildroot}%{_libdir}';" libjavamapscript.la
#make interface
#make
make
%install
rm -rf %{buildroot}
@ -177,15 +194,21 @@ mkdir -p %{buildroot}/%{_cgibindir}
mkdir -p %{buildroot}/%{_sysconfdir}/php.d
mkdir -p %{buildroot}%{_libdir}/php5/extensions
mkdir -p %{buildroot}/%{_bindir}
install -p -m 755 mapserv %{buildroot}/%{_cgibindir}
install -p -m 755 legend %{buildroot}/%{_cgibindir}
install -p -m 755 scalebar %{buildroot}/%{_cgibindir}
install -p -m 755 shp2img %{buildroot}/%{_bindir}
install -p -m 755 shptree %{buildroot}/%{_bindir}
install -p -m 755 sortshp %{buildroot}/%{_bindir}
install -p -m 755 tile4ms %{buildroot}/%{_bindir}
mkdir -p %{buildroot}%{python_sitearch}/
make DESTDIR=%{buildroot} install
cp %{buildroot}%{_bindir}/mapserv %{buildroot}%{_cgibindir}/mapserv
cp %{buildroot}%{_bindir}/legend %{buildroot}%{_cgibindir}/legend
cp %{buildroot}%{_bindir}/scalebar %{buildroot}%{_cgibindir}/scalebar
#install -p -m 755 shp2img %{buildroot}%{_bindir}
#install -p -m 755 shptree %{buildroot}%{_bindir}
#install -p -m 755 sortshp %{buildroot}%{_bindir}
#install -p -m 755 tile4ms %{buildroot}%{_bindir}
#install -p -m 755 mapscript/php/.libs/php_mapscript.so %{buildroot}/%{_libdir}/php5/extensions/
install -p -m 755 mapscript/php/php_mapscript.so %{buildroot}/%{_libdir}/php5/extensions/
# install perl module
pushd mapscript/perl
@ -193,18 +216,18 @@ make DESTDIR=%{buildroot} pure_vendor_install
popd
# install python module
pushd mapscript/python
python setup.py install --root %{buildroot}
mkdir -p %{buildroot}%{python_sitearch}/
mv %{buildroot}/usr/local/%{_lib}/python%py_ver/site-packages/*mapscript* %{buildroot}/usr/%{_lib}/python%py_ver/site-packages/
%if 0%{?suse_version} > 1110 || 0%{?sles_version} > 10
mv %{buildroot}/usr/local/%{_lib}/python%py_ver/site-packages/MapScript* %{buildroot}/usr/%{_lib}/python%py_ver/site-packages/
%endif
popd
#pushd mapscript/python
#python setup.py install --root %{buildroot}
#mv %{buildroot}/usr/local/%{_lib}/python%py_ver/site-packages/*mapscript* %{buildroot}/usr/%{_lib}/python%py_ver/site-packages/
#%if 0%{?suse_version} > 1110 || 0%{?sles_version} > 10
# mv %{buildroot}/usr/local/%{_lib}/python%py_ver/site-packages/MapScript* %{buildroot}/usr/%{_lib}/python%py_ver/site-packages/
#%endif
#popd
# install java
#mkdir -p %{buildroot}%{_javadir}
#install -p -m 644 mapscript/java/mapscript.jar %{buildroot}%{_javadir}/
mkdir -p %{buildroot}%{_javadir}
install -p -m 644 mapscript/java/mapscript.jar %{buildroot}%{_javadir}/
# install php config file
mkdir -p %{buildroot}%{_sysconfdir}/php5/conf.d/
@ -218,10 +241,10 @@ for junk in {*.pod,*.bs,.packlist} ; do
find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
done
# remove vera fonts, these are provided system wide
rm -rf %{buildroot}/%{_docdir}/%{name}-%{version}/tests/vera
rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/tests/vera
# fix some exec bits
chmod 755 %{buildroot}/%{perl_vendorarch}/auto/mapscript/mapscript.so
chmod 755 %{buildroot}%{perl_vendorarch}/auto/mapscript/mapscript.so
%clean
rm -rf %{buildroot}
@ -236,9 +259,19 @@ rm -rf %{buildroot}
%{_bindir}/shptree
%{_bindir}/sortshp
%{_bindir}/tile4ms
%{_bindir}/mapserv
%{_bindir}/legend
%{_bindir}/scalebar
%{_bindir}/mapserver-config
%{_bindir}/msencrypt
%{_bindir}/shptreetst
%{_bindir}/shptreevis
%{_cgibindir}/mapserv
%{_cgibindir}/legend
%{_cgibindir}/scalebar
%{_libdir}/libmapserver-6.*.so
%{_libdir}/libmapserver.la
%{_libdir}/libmapserver.so
%files -n php-mapserver
%defattr(-,root,root)
@ -247,6 +280,9 @@ rm -rf %{buildroot}
%doc mapscript/php/examples
%config(noreplace) %{_sysconfdir}/php5/conf.d/%{name}.ini
%{_libdir}/php5/extensions/php_mapscript.so
%{_libdir}/php5/extensions/php_mapscript.la
%{_libdir}/php5/extensions/php_mapscript.so.0
%{_libdir}/php5/extensions/php_mapscript.so.0.0.0
%files perl
%defattr(-,root,root)
@ -262,11 +298,11 @@ rm -rf %{buildroot}
%doc mapscript/python/tests
%{python_sitearch}/*
#%files java
#%defattr(-,root,root)
#%doc mapscript/java/README
#%doc mapscript/java/examples
#%doc mapscript/java/tests
#%{_javadir}/*.jar
%files java
%defattr(-,root,root)
%doc mapscript/java/README
%doc mapscript/java/examples
%doc mapscript/java/tests
%{_javadir}/*.jar
%changelog