rpms/mapnik/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 mapnik.spec, 1.1, 1.2 sources, 1.2, 1.3 gcc43-warnings.patch, 1.1, NONE

[Balint Cristian]

Author: rezso

Update of /cvs/pkgs/rpms/mapnik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26038/devel

Modified Files:
	.cvsignore import.log mapnik.spec sources 
Removed Files:
	gcc43-warnings.patch 
Log Message:
- new cvs snapshot, x86_64 should work for now
- new cairo dep added
 ----------------------------------------------------------------------
 Modified Files:
 	devel/.cvsignore devel/import.log devel/mapnik.spec 
 	devel/sources 
 Removed Files:
 	devel/gcc43-warnings.patch 
 ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2008 16:00:19 -0000	1.2
+++ .cvsignore	12 Sep 2008 06:45:11 -0000	1.3
@@ -1 +1 @@
-mapnik_src-0.5.1.tar.gz
+mapnik_src-0.5.2.svn738.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Aug 2008 16:00:19 -0000	1.1
+++ import.log	12 Sep 2008 06:45:11 -0000	1.2
@@ -1 +1,2 @@
 mapnik-0_5_1-4_fc9:HEAD:mapnik-0.5.1-4.fc9.src.rpm:1219679501
+mapnik-0_5_2-0_1_svn738_fc10:HEAD:mapnik-0.5.2-0.1.svn738.fc10.src.rpm:1221201860


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mapnik.spec	25 Aug 2008 16:00:19 -0000	1.1
+++ mapnik.spec	12 Sep 2008 06:45:11 -0000	1.2
@@ -1,25 +1,24 @@
 Name:      mapnik
-Version:   0.5.1
-Release:   4%{?dist}
+Version:   0.5.2
+Release:   0.1.svn738%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
 URL:       http://mapnik.org/
-Source0:   http://download.berlios.de/mapnik/mapnik_src-%{version}.tar.gz
+Source0:   http://download.berlios.de/mapnik/mapnik_src-%{version}.svn738.tar.gz
 Source1:   mapnik-data.license
 Source2:   no_date_footer.html
 Patch0:    use-system-fonts.patch
-Patch1:    gcc43-warnings.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  dejavu-fonts
 
 BuildRequires: scons doxygen
-BuildRequires: postgresql-devel python-devel
-BuildRequires: libtool-ltdl-devel pkgconfig
-BuildRequires: gdal-devel proj-devel agg-devel
+BuildRequires: libtool-ltdl-devel
 BuildRequires: libxml2-devel boost-devel
-BuildRequires: libtiff-devel libjpeg-devel
-BuildRequires: libpng-devel freetype-devel fribidi-devel
+BuildRequires: postgresql-devel pkgconfig
+BuildRequires: gdal-devel proj-devel agg-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)")}
@@ -93,9 +92,11 @@
 spatial visualization library
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}
 %patch0 -p0
-%patch1 -p0
+
+# clean SVN
+find . -type d -name .svn -exec rm -rf '{}' +
 
 # get rid of local agg, tinyxml and fonts
 rm -rf agg tinyxml fonts
@@ -127,9 +128,7 @@
 sed -i -e "s|.\#tinyxml..||g" SConstruct
 sed -i -e "s|\#agg\/include|\/usr\/include\/agg2\/|g" SConstruct
 sed -i -e "s|SConscript(.agg|\#SConscript(.agg|g" SConstruct
-sed -i -e "s|\[.iconv.|\[\'dl\'|g" SConstruct
-# system_error.hpp missing on linux
-sed -i -e "s|\[.system.|\#\[\'system\'|g" SConstruct
+
 # 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
@@ -139,10 +138,13 @@
 # fix build flags
 sed -i -e "s|common_cxx_flags = .-D\%s|common_cxx_flags = \'-D\%s $RPM_OPT_FLAGS |g" SConstruct
 
-%{__python} scons/scons.py \
-                PREFIX=%{_prefix} \
-                XMLPARSER=libxml2 \
-                GDAL_INCLUDES=%{_includedir}/gdal
+
+scons %{?_smp_mflags} \
+              PREFIX=%{_prefix} \
+              THREADING=multi \
+              XMLPARSER=libxml2 \
+              GDAL_INCLUDES=%{_includedir}/gdal \
+              INTERNAL_LIBAGG=False
 
 # build doxygen docs
 # use multilib aware footer
@@ -156,10 +158,12 @@
 
 rm -rf %{buildroot}
 
-%{__python} scons/scons.py install DESTDIR=%{buildroot} \
-                PREFIX=%{_prefix} \
-                XMLPARSER=libxml2 \
-                GDAL_INCLUDES=%{_includedir}/gdal
+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
@@ -220,6 +224,10 @@
 %doc demo/python demo/test
 
 %changelog
+* Thu Sep 11 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.1.svn738
+- new cvs snapshot, x86_64 should work for now
+- new cairo dep added
+
 * Mon Aug 25 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.1-4
 - License of demo is GPLv2+ GeoGratis
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2008 16:00:19 -0000	1.2
+++ sources	12 Sep 2008 06:45:11 -0000	1.3
@@ -1 +1 @@
-fa484bdb5cf1faf0720f17129a43038b  mapnik_src-0.5.1.tar.gz
+01b65569ff99e3b3e70880bc47302a11  mapnik_src-0.5.2.svn738.tar.gz


--- gcc43-warnings.patch DELETED ---