update to 3.0.9

rebuilt with libgdal 2.0.1 [release 3.0.9-1mamba;Thu Dec 17 2015]
This commit is contained in:
Silvan Calarco 2024-01-06 05:00:47 +01:00
parent 36d39cbf9f
commit dcd68b443c
2 changed files with 41 additions and 18 deletions

View File

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

View File

@ -1,5 +1,5 @@
Name: libmapnik Name: libmapnik
Version: 2.2.0 Version: 3.0.9
Release: 1mamba Release: 1mamba
Summary: A Free Toolkit for developing mapping applications Summary: A Free Toolkit for developing mapping applications
Group: System/Tools Group: System/Tools
@ -7,8 +7,8 @@ Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://mapnik.org/ URL: http://mapnik.org/
Source: http://mapnik.s3.amazonaws.com/dist/v%{version}/mapnik-v%{version}.tar.bz2 Source: https://mapnik.s3.amazonaws.com/dist/v%{version}/mapnik-v%{version}.tar.bz2
#Source: https://github.com/downloads/mapnik/mapnik/mapnik-v%{version}.tar.bz2 Patch0: libmapnik-3.0.9-boost-mt.patch
License: LGPL License: LGPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -17,19 +17,19 @@ BuildRequires: libcairo-devel
BuildRequires: libfreetype-devel BuildRequires: libfreetype-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libgdal-devel BuildRequires: libgdal-devel
BuildRequires: libharfbuzz-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libpostgresql-devel BuildRequires: libpostgresql-devel
BuildRequires: libproj-devel BuildRequires: libproj-devel
BuildRequires: libpython-devel
BuildRequires: libsqlite-devel BuildRequires: libsqlite-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: libxml2-devel BuildRequires: libwebp-devel
BuildRequires: libz-devel BuildRequires: libz-devel
BuildRequires: python-boost-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: libgdal-devel >= 2.0.1
Provides: mapnik Provides: mapnik
BuildRoot: %{_tmppath}/%{name}-%{version}-root 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. This is the devel package.
%prep %prep
%setup -q -n mapnik-v%{version} %setup -q -n mapnik-v%{version} -D -T
:<< _EOF
#% patch0 -p1
%build %build
%{__python} scons/scons.py configure PREFIX=%{_prefix} CUSTOM_LDFLAGS="-ldl" %{__python} scons/scons.py configure \
#% make PREFIX=%{_prefix} \
LIBDIR_SCHEMA=%{_lib} \
THREADING=multi \
CUSTOM_LDFLAGS="-L%{_libdir} -ldl"
%make
%install %install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{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 %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
@ -65,18 +73,16 @@ This is the devel package.
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/mapnik-speed-check %{_bindir}/mapnik-*
%{_bindir}/shapeindex %{_bindir}/shapeindex
#%{_bindir}/svg2png
%{_bindir}/upgrade_map_xml.py
%{_libdir}/libmapnik.so.* %{_libdir}/libmapnik.so.*
%dir %{_libdir}/mapnik %dir %{_libdir}/mapnik
%{_libdir}/mapnik/fonts %{_libdir}/mapnik/fonts
%{_libdir}/mapnik/input %{_libdir}/mapnik/input
%dir %{python_sitearch}/mapnik #%dir %{python_sitearch}/mapnik
%{python_sitearch}/mapnik/* #%{python_sitearch}/mapnik/*
%dir %{python_sitearch}/mapnik2 #%dir %{python_sitearch}/mapnik2
%{python_sitearch}/mapnik2/* #%{python_sitearch}/mapnik2/*
%doc COPYING %doc COPYING
%files devel %files devel
@ -84,10 +90,16 @@ This is the devel package.
%{_bindir}/mapnik-config %{_bindir}/mapnik-config
%dir %{_includedir}/mapnik %dir %{_includedir}/mapnik
%{_includedir}/mapnik/* %{_includedir}/mapnik/*
%{_libdir}/libmapnik-json.a
%{_libdir}/libmapnik-wkt.a
%{_libdir}/libmapnik.so %{_libdir}/libmapnik.so
#%doc README #%doc README
%changelog %changelog
* Thu Dec 17 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 3.0.9-1mamba
- update to 3.0.9
- rebuilt with libgdal 2.0.1
* Thu Jun 20 2013 Automatic Build System <autodist@mambasoft.it> 2.2.0-1mamba * Thu Jun 20 2013 Automatic Build System <autodist@mambasoft.it> 2.2.0-1mamba
- update to 2.2.0 - update to 2.2.0