rpms/mapnik/devel import.log,1.6,1.7 mapnik.spec,1.6,1.7

[Balint Cristian]

Author: rezso

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

Modified Files:
	import.log mapnik.spec 
Log Message:
- fix self dependency build for viewer



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	8 Oct 2008 12:59:11 -0000	1.6
+++ import.log	8 Oct 2008 14:15:22 -0000	1.7
@@ -4,3 +4,4 @@
 mapnik-0_5_2-0_3_svn738_fc10:HEAD:mapnik-0.5.2-0.3.svn738.fc10.src.rpm:1221205271
 mapnik-0_5_2-0_4_svn738_fc10:HEAD:mapnik-0.5.2-0.4.svn738.fc10.src.rpm:1222342000
 mapnik-0_5_2-0_5_svn738_fc10:HEAD:mapnik-0.5.2-0.5.svn738.fc10.src.rpm:1223470700
+mapnik-0_5_2-0_6_svn738_fc10:HEAD:mapnik-0.5.2-0.6.svn738.fc10.src.rpm:1223475251


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mapnik.spec	8 Oct 2008 12:59:11 -0000	1.6
+++ mapnik.spec	8 Oct 2008 14:15:22 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.5.2
-Release:   0.5.svn738%{?dist}
+Release:   0.6.svn738%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -128,8 +128,9 @@
 # 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|/opt/%{name}/include|%{_includedir}/%{name}|g' demo/viewer/viewer.pro
+sed -i -e 's|/opt/%{name}/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
@@ -143,7 +144,7 @@
 # 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 brak build
+# WARNING smp may break build
 # %{?_smp_mflags}
 scons         PREFIX=%{_prefix} \
               THREADING=multi \
@@ -154,7 +155,9 @@
 # build mapnik viewer app
 pushd demo/viewer
 qmake-qt4 viewer.pro
-make %{?_smp_mflags}
+# WARNING smp may break build
+# %{?_smp_mflags}
+make
 popd
 
 # build doxygen docs
@@ -258,6 +261,9 @@
 %doc demo/python demo/test
 
 %changelog
+* Wed Oct 08 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.6.svn738
+- fix self dependency build for viewer
+
 * Wed Oct 08 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.5.svn738
 - enable viewer application for mapnik's xml templates
 - exclude viewer from demo than