diff --git a/import.log b/import.log index e2755ba..9db1162 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ mapnik-0_5_2-0_2_svn738_fc10:HEAD:mapnik-0.5.2-0.2.svn738.fc10.src.rpm:122120452 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 diff --git a/mapnik.spec b/mapnik.spec index b8a9fda..014c72f 100644 --- a/mapnik.spec +++ b/mapnik.spec @@ -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 @@ 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|/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 @@ sed -i -e "s|libraries \= \[|libraries \= \[\'mapnik\'|g" plugins/input/raster/S # 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 @@ scons PREFIX=%{_prefix} \ # 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 @@ rm -rf %{buildroot} %doc demo/python demo/test %changelog +* Wed Oct 08 2008 Balint Cristian - 0.5.2-0.6.svn738 +- fix self dependency build for viewer + * Wed Oct 08 2008 Balint Cristian - 0.5.2-0.5.svn738 - enable viewer application for mapnik's xml templates - exclude viewer from demo than