diff --git a/libmapnik-3.0.9-boost-mt.patch b/libmapnik-3.0.9-boost-mt.patch new file mode 100644 index 0000000..f35bc59 --- /dev/null +++ b/libmapnik-3.0.9-boost-mt.patch @@ -0,0 +1,11 @@ +--- mapnik-v3.0.9/SConstruct.orig 2015-12-17 12:21:38.349046436 +0100 ++++ mapnik-v3.0.9/SConstruct 2015-12-17 12:22:13.035596111 +0100 +@@ -1407,7 +1407,7 @@ + ] + + if env['THREADING'] == 'multi': +- BOOST_LIBSHEADERS.append(['thread', 'boost/thread/mutex.hpp', True]) ++ BOOST_LIBSHEADERS.append(['thread-mt', 'boost/thread/mutex.hpp', True]) + # on solaris the configure checks for boost_thread + # require the -pthreads flag to be able to check for + # threading support, so we add as a global library instead diff --git a/libmapnik.spec b/libmapnik.spec index 0e33787..728cef7 100644 --- a/libmapnik.spec +++ b/libmapnik.spec @@ -1,5 +1,5 @@ Name: libmapnik -Version: 2.2.0 +Version: 3.0.9 Release: 1mamba Summary: A Free Toolkit for developing mapping applications Group: System/Tools @@ -7,8 +7,8 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://mapnik.org/ -Source: http://mapnik.s3.amazonaws.com/dist/v%{version}/mapnik-v%{version}.tar.bz2 -#Source: https://github.com/downloads/mapnik/mapnik/mapnik-v%{version}.tar.bz2 +Source: https://mapnik.s3.amazonaws.com/dist/v%{version}/mapnik-v%{version}.tar.bz2 +Patch0: libmapnik-3.0.9-boost-mt.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -17,19 +17,19 @@ BuildRequires: libcairo-devel BuildRequires: libfreetype-devel BuildRequires: libgcc BuildRequires: libgdal-devel +BuildRequires: libharfbuzz-devel BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libpostgresql-devel BuildRequires: libproj-devel -BuildRequires: libpython-devel BuildRequires: libsqlite-devel BuildRequires: libstdc++6-devel BuildRequires: libtiff-devel -BuildRequires: libxml2-devel +BuildRequires: libwebp-devel BuildRequires: libz-devel -BuildRequires: python-boost-devel ## AUTOBUILDREQ-END +BuildRequires: libgdal-devel >= 2.0.1 Provides: mapnik BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -46,16 +46,24 @@ Mapnik is a Free Toolkit for developing mapping applications. Above all Mapnik i This is the devel package. %prep -%setup -q -n mapnik-v%{version} +%setup -q -n mapnik-v%{version} -D -T +:<< _EOF +#% patch0 -p1 %build -%{__python} scons/scons.py configure PREFIX=%{_prefix} CUSTOM_LDFLAGS="-ldl" -#% make +%{__python} scons/scons.py configure \ + PREFIX=%{_prefix} \ + LIBDIR_SCHEMA=%{_lib} \ + THREADING=multi \ + CUSTOM_LDFLAGS="-L%{_libdir} -ldl" + +%make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%{__python} scons/scons.py install DESTDIR=%{buildroot} %{_smp_mflags} -#% makeinstall +%makeinstall +#%{__python} scons/scons.py install \ +# DESTDIR=%{buildroot} %{_smp_mflags} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -65,18 +73,16 @@ This is the devel package. %files %defattr(-,root,root) -%{_bindir}/mapnik-speed-check +%{_bindir}/mapnik-* %{_bindir}/shapeindex -#%{_bindir}/svg2png -%{_bindir}/upgrade_map_xml.py %{_libdir}/libmapnik.so.* %dir %{_libdir}/mapnik %{_libdir}/mapnik/fonts %{_libdir}/mapnik/input -%dir %{python_sitearch}/mapnik -%{python_sitearch}/mapnik/* -%dir %{python_sitearch}/mapnik2 -%{python_sitearch}/mapnik2/* +#%dir %{python_sitearch}/mapnik +#%{python_sitearch}/mapnik/* +#%dir %{python_sitearch}/mapnik2 +#%{python_sitearch}/mapnik2/* %doc COPYING %files devel @@ -84,10 +90,16 @@ This is the devel package. %{_bindir}/mapnik-config %dir %{_includedir}/mapnik %{_includedir}/mapnik/* +%{_libdir}/libmapnik-json.a +%{_libdir}/libmapnik-wkt.a %{_libdir}/libmapnik.so #%doc README %changelog +* Thu Dec 17 2015 Silvan Calarco 3.0.9-1mamba +- update to 3.0.9 +- rebuilt with libgdal 2.0.1 + * Thu Jun 20 2013 Automatic Build System 2.2.0-1mamba - update to 2.2.0