rpms/mapnik/devel import.log,1.2,1.3 mapnik.spec,1.2,1.3

[Balint Cristian]

Author: rezso

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

Modified Files:
	import.log mapnik.spec 
Log Message:
- fix koji build
- disable smp build with upstream scons

 ----------------------------------------------------------------------
 Modified Files:
 	devel/import.log devel/mapnik.spec 
 ----------------------------------------------------------------------



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Sep 2008 06:45:11 -0000	1.2
+++ import.log	12 Sep 2008 07:29:27 -0000	1.3
@@ -1,2 +1,3 @@
 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
+mapnik-0_5_2-0_2_svn738_fc10:HEAD:mapnik-0.5.2-0.2.svn738.fc10.src.rpm:1221204521


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapnik.spec	12 Sep 2008 06:45:11 -0000	1.2
+++ mapnik.spec	12 Sep 2008 07:29:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.5.2
-Release:   0.1.svn738%{?dist}
+Release:   0.2.svn738%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -124,11 +124,6 @@
 
 %build
 
-# do not use internal agg and tinyxml
-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
-
 # 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
@@ -138,9 +133,9 @@
 # fix build flags
 sed -i -e "s|common_cxx_flags = .-D\%s|common_cxx_flags = \'-D\%s $RPM_OPT_FLAGS |g" SConstruct
 
-
-scons %{?_smp_mflags} \
-              PREFIX=%{_prefix} \
+# WARNING smp may brak build
+# %{?_smp_mflags}
+scons         PREFIX=%{_prefix} \
               THREADING=multi \
               XMLPARSER=libxml2 \
               GDAL_INCLUDES=%{_includedir}/gdal \
@@ -224,6 +219,10 @@
 %doc demo/python demo/test
 
 %changelog
+* Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.2.svn738
+- fix koji build
+- disable smp build with upstream scons
+
 * 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