Attachment 718069 Details for Bug 912087 – Upgrade to 2.1.0

[patch] Upgrade to 2.1.0

mapnik-2.1.0-2.patch (text/plain), 12.77 KB, created by Jeffrey C. Ollie on 2013-03-29 12:42:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeffrey C. Ollie

Created: 2013-03-29 12:42:18 UTC

Size: 12.77 KB

patch

obsolete

>diff --git a/mapnik-2.0.0-64bit.patch b/mapnik-2.0.0-64bit.patch
>deleted file mode 100644
>index 1afe002..0000000
>--- a/mapnik-2.0.0-64bit.patch
>+++ /dev/null
>@@ -1,12 +0,0 @@
>-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
>deleted file mode 100644
>index 00e89ca..0000000
>--- a/mapnik-2.0.0-big-endian.patch
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-commit f8e2a3ed1b13fb2e37fb890ae452eea98054f4f9
>-Author: Dane Springmeyer <dane@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
>deleted file mode 100644
>index 77a59c8..0000000
>--- a/mapnik-2.0.0-build-viewer.patch
>+++ /dev/null
>@@ -1,21 +0,0 @@
>---- 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 9565d29..257611c 100644
>--- a/mapnik.spec
>+++ b/mapnik.spec
>@@ -1,31 +1,47 @@
>-Name:      mapnik
>-Version:   2.0.0
>-Release:   13%{?dist}
>-Summary:   Free Toolkit for developing mapping applications
>-Group:     Applications/Engineering
>-License:   LGPLv2+
>-URL:       http://mapnik.org/
>-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.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
>-
>-BuildRequires: postgresql-devel pkgconfig
>-BuildRequires: gdal-devel proj-devel agg-devel
>-BuildRequires: scons desktop-file-utils gcc-c++
>-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
>-
>-%{!?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}/mapnik/input
>+%filter_setup
>+
>+Name:          mapnik
>+Version:       2.1.0
>+Release:       2%{?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
>+Source1:       mapnik-data.license
>+Source2:       viewer.desktop
>+Patch0:        mapnik-2.1.0-build-viewer.patch
>+
>+Requires:      dejavu-lgc-sans-fonts
>+Requires:      dejavu-lgc-sans-mono-fonts
>+Requires:      dejavu-lgc-serif-fonts
>+Requires:      dejavu-sans-fonts
>+Requires:      dejavu-sans-mono-fonts
>+Requires:      dejavu-serif-fonts
>+Requires:      proj-epsg
>+
>+BuildRequires: agg-devel
>+BuildRequires: boost-devel
>+BuildRequires: cairomm-devel
>+BuildRequires: desktop-file-utils
>+BuildRequires: freetype-devel
>+BuildRequires: gcc-c++
>+BuildRequires: gdal-devel
>+BuildRequires: libcurl-devel
>+BuildRequires: libicu-devel
>+BuildRequires: libjpeg-devel
>+BuildRequires: libpng-devel
>+BuildRequires: libtiff-devel
>+BuildRequires: libtool-ltdl-devel
>+BuildRequires: libxml2-devel
>+BuildRequires: pkgconfig
>+BuildRequires: postgresql-devel
>+BuildRequires: proj-devel
>+BuildRequires: pycairo-devel
>+BuildRequires: qt-devel > 4.3
>+BuildRequires: scons
>+BuildRequires: sqlite-devel
> 
> %description
> Mapnik is a Free Toolkit for developing mapping applications.
>@@ -46,9 +62,12 @@ industry standard libraries from boost.org
> %package devel
> Summary: Mapnik is a Free toolkit for developing mapping applications
> Group: Development/Tools
>-Requires: %{name} = %{version}-%{release}
>-Requires: libpng-devel libjpeg-devel freetype-devel
>-Requires: agg-devel proj-devel
>+Requires: mapnik = %{version}-%{release}
>+Requires: agg-devel
>+Requires: freetype-devel
>+Requires: libjpeg-devel
>+Requires: libpng-devel
>+Requires: proj-devel
> 
> %description devel
> Mapnik is a Free Toolkit for developing mapping applications.
>@@ -70,8 +89,9 @@ industry standard libraries from boost.org
> Summary:  Python bindings for the Mapnik spatial visualization library
> License:  GPLv2+
> Group:    Development/Libraries
>-Requires: %{name} = %{version}-%{release}
>-Requires: python-imaging python-lxml
>+Requires: mapnik = %{version}-%{release}
>+Requires: python-imaging
>+Requires: python-lxml
> 
> %description python
> Language bindings to enable the Mapnik library to be used from python
>@@ -80,7 +100,7 @@ Language bindings to enable the Mapnik library to be used from python
> License:  GPLv2+
> Summary:  Utilities distributed with the Mapnik spatial visualization library
> Group:    Development/Libraries
>-Requires: %{name} = %{version}-%{release}
>+Requires: mapnik = %{version}-%{release}
> 
> %description utils
> Miscellaneous utilities distributed with the Mapnik spatial visualization
>@@ -90,19 +110,17 @@ library
> Summary:  Demo utility and some sample data distributed with mapnik
> License:  GPLv2+ GeoGratis
> Group:    Development/Libraries
>-Requires: %{name}-devel = %{version}-%{release}
>-Requires: %{name}-python = %{version}-%{release}
>+Requires: mapnik-devel = %{version}-%{release}
>+Requires: mapnik-python = %{version}-%{release}
> 
> %description demo
> Demo application and sample vector datas distributed with the Mapnik
> spatial visualization library
> 
> %prep
>-%setup -q -n %{name}-%{version}
>+%setup -q -n mapnik-v%{version}
> 
>-%patch0 -p0
>-%patch1 -p1
>-%patch2 -p1
>+%patch0 -p1
> 
> # clean SVN
> find . -type d -name .svn -exec rm -rf '{}' +
>@@ -128,58 +146,45 @@ 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 '{}' \;
> 
> # fix wrong path in some demo files
>-sed -i -e 's|/lib/mapnik/input/|/%{name}/input/|g' demo/c++/rundemo.cpp
>+sed -i -e 's|/lib/mapnik/input/|/mapnik/input/|g' demo/c++/rundemo.cpp
> 
>-sed -i -e 's|/opt/%{name}/include|../../include|g' demo/viewer/viewer.pro
>+sed -i -e 's|/opt/mapnik/include|../../include|g' demo/viewer/viewer.pro
> sed -i -e 's|/opt/boost/include/boost-1_34_1|%{_includedir}/boost|g' demo/viewer/viewer.pro
> sed -i -e 's|-L/opt/mapnik/lib|-L../../src/|g' demo/viewer/viewer.pro
> sed -i -e 's|/usr/local|/usr|g' demo/viewer/viewer.pro
> 
> %build
>-
>-# linkage errors
>-#sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/gdal/SConscript
>-#sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/postgis/SConscript
>-#sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\',|g" plugins/input/shape/SConscript
>-#sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\'|g" plugins/input/raster/SConscript
>-
> # fix build flags
> sed -i -e "s|common_cxx_flags = .-D\%s|common_cxx_flags = \'-D\%s $RPM_OPT_FLAGS |g" SConstruct
> 
>-# 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
>+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}
>+
>+scons %{?_smp_mflags}
> 
> # build mapnik viewer app
> pushd demo/viewer
> qmake-qt4 viewer.pro
>-# WARNING smp may break build
>-# %{?_smp_mflags}
>-make
>+make %{?_smp_mflags}
> popd
> 
> %install
> 
>-scons install DESTDIR=%{buildroot} \
>-              PREFIX=%{_prefix} \
>-              THREADING=multi \
>-              XMLPARSER=libxml2 \
>-              GDAL_INCLUDES=%{_includedir}/gdal \
>-              INTERNAL_LIBAGG=False
>+scons install
> 
> # get rid of fonts use external instead
>-rm -rf %{buildroot}%{_libdir}/%{name}/fonts
>+rm -rf %{buildroot}%{_libdir}/mapnik/fonts
> 
> # install more utils
> mkdir -p %{buildroot}%{_bindir}
>@@ -188,28 +193,28 @@ install -p -m 755 utils/stats/mapdef_stats.py %{buildroot}%{_bindir}/
> install -p -m 644 %{SOURCE1} demo/data/
> 
> # install pkgconfig file
>-cat > %{name}.pc <<EOF
>+cat > mapnik.pc <<EOF
> prefix=%{_prefix}
> exec_prefix=%{_prefix}
> includedir=%{_includedir}
> 
>-Name: %{name}
>+Name: mapnik
> Description: Free Toolkit for developing mapping applications
> Version: %{version}
> Requires: libagg
> Libs: -lmapnik
>-Cflags: -I\${includedir}/%{name}
>+Cflags: -I\${includedir}/mapnik
> EOF
> 
> mkdir -p %{buildroot}%{_datadir}/pkgconfig/
>-install -p -m 644 %{name}.pc %{buildroot}%{_datadir}/pkgconfig/
>+install -p -m 644 mapnik.pc %{buildroot}%{_datadir}/pkgconfig/
> 
> # install desktop file
> desktop-file-install \
> %if 0%{?fedora} && 0%{?fedora} < 19
>         --vendor="fedora" \
> %endif
>-        --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
>+        --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
> 
> %check
> 
>@@ -233,29 +238,31 @@ popd
> 
> %files
> %defattr(-,root,root,-)
>-%doc AUTHORS COPYING README
>-%dir %{_libdir}/%{name}2
>-%dir %{_libdir}/%{name}2/input
>+%doc AUTHORS.md CHANGELOG.md COPYING README.md
>+%dir %{_libdir}/mapnik
>+%dir %{_libdir}/mapnik/input
> %{_bindir}/mapnik-config
>-%{_libdir}/%{name}2/input/*.input
>-%{_libdir}/lib%{name}2.so.*
>+%{_libdir}/mapnik/input/*.input
>+%{_libdir}/libmapnik.so.*
> 
> %files devel
> %defattr(-,root,root,-)
> %doc docs/
>-%dir %{_includedir}/%{name}
>-%{_includedir}/%{name}/*
>-%{_libdir}/lib%{name}2.so
>-%{_datadir}/pkgconfig/%{name}.pc
>+%dir %{_includedir}/mapnik
>+%{_includedir}/mapnik/*
>+%{_libdir}/libmapnik.so
>+%{_datadir}/pkgconfig/mapnik.pc
> 
> %files python
> %defattr(-,root,root,-)
>-%{python_sitearch}/%{name}2
>+%{python_sitearch}/mapnik
>+%{python_sitearch}/mapnik2
> %{_bindir}/mapdef_stats.py
> 
> %files utils
> %defattr(-,root,root,-)
> %{_bindir}/shapeindex
>+%{_bindir}/svg2png
> %{_bindir}/viewer
> %{_bindir}/mapnik-speed-check
> %{_bindir}/upgrade_map_xml.py
>@@ -272,6 +279,14 @@ popd
> %doc demo/python demo/test
> 
> %changelog
>+* Fri Mar 29 2013 Jeffrey Ollie <jeff@ocjtech.us> - 2.1.0-2
>+- Fix build so that nothing gets recompiled in install phase
>+- Other clean-ups
>+
>+* Sat Feb 16 2013 Tom Hughes <tom@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@fedoraproject.org> - 2.0.0-13
> - Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
> 
>diff --git a/no_date_footer.html b/no_date_footer.html
>deleted file mode 100644
>index 3d46190..0000000
>--- a/no_date_footer.html
>+++ /dev/null
>@@ -1,7 +0,0 @@
>-<hr size="1"><address style="text-align: right;"><small>
>-Generated for $projectname by <a href="http://www.doxygen.org/
>-index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
>-$doxygenversion</small></address>
>-</body>
>-</html>
>-

Actions: View | Diff

Attachments on bug 912087: 698540 | 699384 | 718069 | 718075 | 730938 | 730969 | 730986