[mapnik/f19] Revert attempt to update F19 to mapnik 2.1.0
Tom Hughes
tomh at fedoraproject.org
Mon Jul 29 09:43:10 UTC 2013
commit 232f00961123fe137e53969df101c1de85a8584e
Author: Tom Hughes <tom at compton.nu>
Date: Sat Jul 27 23:13:41 2013 +0100
Revert attempt to update F19 to mapnik 2.1.0
.gitignore | 1 -
mapnik-2.0.0-64bit.patch | 12 ++++++
mapnik-2.0.0-big-endian.patch | 19 +++++++++
mapnik-2.0.0-build-viewer.patch | 21 ++++++++++
mapnik-2.1.0-boost.patch | 36 -----------------
mapnik-2.1.0-build-viewer.patch | 20 ----------
mapnik.spec | 81 ++++++++++++++++----------------------
sources | 2 +-
8 files changed, 87 insertions(+), 105 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d64583d..2668151 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
mapnik-0.7.1.tar.bz2
/mapnik-2.0.0.tar.bz2
-/mapnik-v2.1.0.tar.bz2
diff --git a/mapnik-2.0.0-64bit.patch b/mapnik-2.0.0-64bit.patch
new file mode 100644
index 0000000..1afe002
--- /dev/null
+++ b/mapnik-2.0.0-64bit.patch
@@ -0,0 +1,12 @@
+diff -up mapnik-2.0.0/SConstruct.64bit mapnik-2.0.0/SConstruct
+--- mapnik-2.0.0/SConstruct.64bit 2013-01-02 14:56:07.000000000 +0100
++++ mapnik-2.0.0/SConstruct 2013-01-02 14:56:49.000000000 +0100
+@@ -265,7 +265,7 @@ if platform.dist()[0] in ('Ubuntu','debi
+ LIBDIR_SCHEMA='lib'
+ elif platform.uname()[4] == 'x86_64' and platform.system() == 'Linux':
+ LIBDIR_SCHEMA='lib64'
+-elif platform.uname()[4] == 'ppc64':
++elif platform.uname()[4] in ['ppc64', 's390x', 'sparc64']:
+ LIBDIR_SCHEMA='lib64'
+ else:
+ LIBDIR_SCHEMA='lib'
diff --git a/mapnik-2.0.0-big-endian.patch b/mapnik-2.0.0-big-endian.patch
new file mode 100644
index 0000000..00e89ca
--- /dev/null
+++ b/mapnik-2.0.0-big-endian.patch
@@ -0,0 +1,19 @@
+commit f8e2a3ed1b13fb2e37fb890ae452eea98054f4f9
+Author: Dane Springmeyer <dane at dbsgeo.com>
+Date: Mon Oct 10 14:03:43 2011 -0700
+
+ fix compile on ppc (big endian) systems
+
+diff --git a/include/mapnik/grid/grid.hpp b/include/mapnik/grid/grid.hpp
+index bf644bb..8951d93 100644
+--- a/include/mapnik/grid/grid.hpp
++++ b/include/mapnik/grid/grid.hpp
+@@ -284,7 +284,7 @@ public:
+ {
+
+ #ifdef MAPNIK_BIG_ENDIAN
+- unsigned a1 = (int)((rgba1 & 0xff) * opacity) & 0xff; // adjust for desired opacity
++ unsigned a = (int)((rgba1 & 0xff) * opacity) & 0xff; // adjust for desired opacity
+ #else
+ unsigned a = (int)(((rgba1 >> 24) & 0xff) * opacity) & 0xff; // adjust for desired opacity
+ #endif
diff --git a/mapnik-2.0.0-build-viewer.patch b/mapnik-2.0.0-build-viewer.patch
new file mode 100644
index 0000000..77a59c8
--- /dev/null
+++ b/mapnik-2.0.0-build-viewer.patch
@@ -0,0 +1,21 @@
+--- demo/viewer/viewer.pro.orig 2011-11-22 15:31:15.047234855 -0500
++++ demo/viewer/viewer.pro 2011-11-22 15:32:35.205213622 -0500
+@@ -4,14 +4,15 @@
+ CC = g++
+ TEMPLATE = app
+
+-INCLUDEPATH += /usr/local/include/
++INCLUDEPATH += /usr/include/
++INCLUDEPATH += ../../include/
+ INCLUDEPATH += /usr/boost/include/
+ INCLUDEPATH += /usr/X11/include/
+-INCLUDEPATH += /usr/X11/include/freetype2
++INCLUDEPATH += /usr/include/freetype2
+ INCLUDEPATH += .
+
+ QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers -ansi'
+-unix:LIBS = -L/usr/local/lib -L/usr/X11/lib -lmapnik2 -lfreetype
++unix:LIBS = -L../../src/ -L/usr/local/lib -L/usr/X11/lib -lmapnik2 -lfreetype
+ unix:LIBS += -lboost_system -licuuc -lboost_filesystem -lboost_regex
+
+ # Input
diff --git a/mapnik.spec b/mapnik.spec
index 684ec07..9565d29 100644
--- a/mapnik.spec
+++ b/mapnik.spec
@@ -1,16 +1,17 @@
Name: mapnik
-Version: 2.1.0
-Release: 3%{?dist}
+Version: 2.0.0
+Release: 13%{?dist}
Summary: Free Toolkit for developing mapping applications
Group: Applications/Engineering
License: LGPLv2+
URL: http://mapnik.org/
-Source0: https://github.com/downloads/mapnik/mapnik/mapnik-v%{version}.tar.bz2
+Source0: http://download.berlios.de/mapnik/mapnik-%{version}.tar.bz2
Source1: mapnik-data.license
Source2: no_date_footer.html
Source3: viewer.desktop
-Patch0: mapnik-2.1.0-build-viewer.patch
-Patch1: mapnik-2.1.0-boost.patch
+Patch0: mapnik-2.0.0-build-viewer.patch
+Patch1: mapnik-2.0.0-big-endian.patch
+Patch2: mapnik-2.0.0-64bit.patch
Requires: dejavu-serif-fonts dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-lgc-serif-fonts dejavu-lgc-sans-fonts dejavu-lgc-sans-mono-fonts
Requires: proj-epsg
@@ -22,14 +23,10 @@ BuildRequires: libtool-ltdl-devel qt-devel > 4.3
BuildRequires: libxml2-devel boost-devel libicu-devel
BuildRequires: libtiff-devel libjpeg-devel libpng-devel
BuildRequires: cairomm-devel pycairo-devel freetype-devel
-BuildRequires: sqlite-devel libcurl-devel
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%filter_provides_in %{_libdir}/%{name}/input
-%filter_setup
-
%description
Mapnik is a Free Toolkit for developing mapping applications.
It's written in C++ and there are Python bindings to
@@ -101,10 +98,11 @@ Demo application and sample vector datas distributed with the Mapnik
spatial visualization library
%prep
-%setup -q -n %{name}-v%{version}
+%setup -q -n %{name}-%{version}
-%patch0 -p1
+%patch0 -p0
%patch1 -p1
+%patch2 -p1
# clean SVN
find . -type d -name .svn -exec rm -rf '{}' +
@@ -130,6 +128,7 @@ set -x
# fix spurious exec flag
chmod -x demo/viewer/images/*.png
+chmod -x bindings/python/mapnik/ogcserver/modserver.py
chmod -x demo/data/test/regenerate.sh
find . -type d -perm /g+s -exec chmod -s '{}' \;
@@ -152,30 +151,32 @@ sed -i -e 's|/usr/local|/usr|g' demo/viewer/viewer.pro
# fix build flags
sed -i -e "s|common_cxx_flags = .-D\%s|common_cxx_flags = \'-D\%s $RPM_OPT_FLAGS |g" SConstruct
-# configure mapnik
-scons configure DESTDIR=%{buildroot} \
- PREFIX=%{_prefix} \
- THREADING=multi \
- XMLPARSER=libxml2 \
- GDAL_INCLUDES=%{_includedir}/gdal \
- INTERNAL_LIBAGG=False \
- SYSTEM_FONTS=%{_datadir}/fonts \
- BOOST_SYSTEM_REQUIRED=True \
- LIBDIR_SCHEMA=%{_lib}
-
-# build mapnik
-scons %{?_smp_mflags}
+# WARNING smp may break build
+# %{?_smp_mflags}
+scons PREFIX=%{_prefix} \
+ THREADING=multi \
+ XMLPARSER=libxml2 \
+ GDAL_INCLUDES=%{_includedir}/gdal \
+ INTERNAL_LIBAGG=False \
+ SYSTEM_FONTS=%{_datadir}/fonts \
+ BOOST_SYSTEM_REQUIRED=True
# build mapnik viewer app
pushd demo/viewer
qmake-qt4 viewer.pro
-make %{?_smp_mflags}
+# WARNING smp may break build
+# %{?_smp_mflags}
+make
popd
%install
-# install mapnik
-scons install
+scons install DESTDIR=%{buildroot} \
+ PREFIX=%{_prefix} \
+ THREADING=multi \
+ XMLPARSER=libxml2 \
+ GDAL_INCLUDES=%{_includedir}/gdal \
+ INTERNAL_LIBAGG=False
# get rid of fonts use external instead
rm -rf %{buildroot}%{_libdir}/%{name}/fonts
@@ -232,31 +233,29 @@ popd
%files
%defattr(-,root,root,-)
-%doc AUTHORS.md CHANGELOG.md COPYING README.md
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/input
+%doc AUTHORS COPYING README
+%dir %{_libdir}/%{name}2
+%dir %{_libdir}/%{name}2/input
%{_bindir}/mapnik-config
-%{_libdir}/%{name}/input/*.input
-%{_libdir}/lib%{name}.so.*
+%{_libdir}/%{name}2/input/*.input
+%{_libdir}/lib%{name}2.so.*
%files devel
%defattr(-,root,root,-)
%doc docs/
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*
-%{_libdir}/lib%{name}.so
+%{_libdir}/lib%{name}2.so
%{_datadir}/pkgconfig/%{name}.pc
%files python
%defattr(-,root,root,-)
-%{python_sitearch}/%{name}
%{python_sitearch}/%{name}2
%{_bindir}/mapdef_stats.py
%files utils
%defattr(-,root,root,-)
%{_bindir}/shapeindex
-%{_bindir}/svg2png
%{_bindir}/viewer
%{_bindir}/mapnik-speed-check
%{_bindir}/upgrade_map_xml.py
@@ -273,18 +272,6 @@ popd
%doc demo/python demo/test
%changelog
-* Mon Apr 29 2013 Alex Lancaster <alexlan fedoraproject org> - 2.1.0-3
-- Patch for newer boost from upstream
-
-* Tue Apr 2 2013 Tom Hughes <tom at compton.nu> - 2.1.0-2
-- Avoid recompilation during install phase
-- Use parallel compilation
-- BuildRequire libcurl-devel for the osm plugin
-
-* Sat Feb 16 2013 Tom Hughes <tom at compton.nu> - 2.1.0-1
-- Update to 2.1.0 upstream release
-- Filter out provides from the plugins
-
* Thu Feb 14 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0.0-13
- Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
diff --git a/sources b/sources
index 49bc72d..f3bc807 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d580c558a957444873bec9e24526b0a0 mapnik-v2.1.0.tar.bz2
+499c6a61544014b9bc2a7c978f963ef3 mapnik-2.0.0.tar.bz2
More information about the scm-commits
mailing list