rpms/mapnik/devel viewer.desktop, NONE, 1.1 import.log, 1.5, 1.6 mapnik.spec, 1.5, 1.6

[Balint Cristian]

Author: rezso

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

Modified Files:
	import.log mapnik.spec 
Added Files:
	viewer.desktop 
Log Message:
- enable viewer application for mapnik's xml templates
- exclude viewer from demo than



--- NEW FILE viewer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Mapnik Viewer
Comment=Mapnik XML template viewer
Exec=viewer
Terminal=false
Type=Application
Categories=Engineering;

Name[en]=Mapnik Viewer
Comment[en]=Mapnik XML template viewer
Name[ro]=Vizualizator Mapnik
Comment[ro]=Vizualizare fiÅŸiere XML Mapnik
Name[hu]=Mapnik Böngésző
Comment[hu]=Mapnik XML fájl böngésző


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	25 Sep 2008 11:27:47 -0000	1.5
+++ import.log	8 Oct 2008 12:59:11 -0000	1.6
@@ -3,3 +3,4 @@
 mapnik-0_5_2-0_2_svn738_fc10:HEAD:mapnik-0.5.2-0.2.svn738.fc10.src.rpm:1221204521
 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


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mapnik.spec	25 Sep 2008 11:27:47 -0000	1.5
+++ mapnik.spec	8 Oct 2008 12:59:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.5.2
-Release:   0.4.svn738%{?dist}
+Release:   0.5.svn738%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -8,14 +8,15 @@
 Source0:   http://download.berlios.de/mapnik/mapnik_src-%{version}.svn738.tar.gz
 Source1:   mapnik-data.license
 Source2:   no_date_footer.html
+Source3:   viewer.desktop
 Patch0:    use-system-fonts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  dejavu-fonts
 
 BuildRequires: scons doxygen
-BuildRequires: libtool-ltdl-devel
 BuildRequires: postgresql-devel pkgconfig
 BuildRequires: gdal-devel proj-devel agg-devel
+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
@@ -72,6 +73,7 @@
 Language bindings to enable the Mapnik library to be used from python
 
 %package utils
+License:  GPLv2+
 Summary:  Utilities distributed with the Mapnik spatial visualization library
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
@@ -123,9 +125,13 @@
 chmod -x demo/data/test/regenerate.sh
 find . -type d -perm /g+s -exec chmod -s '{}' \;
 
-# fix wrong path in a demo file
+# 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/boost/include/boost-1_34_1|%{_includedir}/boost|g' demo/viewer/viewer.pro
+sed -i -e 's|/usr/local|/usr|g' demo/viewer/viewer.pro
+
 %build
 
 # linkage errors
@@ -145,6 +151,12 @@
               GDAL_INCLUDES=%{_includedir}/gdal \
               INTERNAL_LIBAGG=False
 
+# build mapnik viewer app
+pushd demo/viewer
+qmake-qt4 viewer.pro
+make %{?_smp_mflags}
+popd
+
 # build doxygen docs
 # use multilib aware footer
 sed -i -e 's|HTML_FOOTER|HTML_FOOTER=no_date_footer.html\n\#|g' docs/doxygen/Doxyfile
@@ -169,6 +181,7 @@
 
 # install more utils
 mkdir -p %{buildroot}%{_bindir}
+install -p -m 755 demo/viewer/viewer %{buildroot}%{_bindir}/
 install -p -m 755 utils/stats/mapdef_stats.py %{buildroot}%{_bindir}/
 install -p -m 644 %{SOURCE1} demo/data/
 
@@ -188,6 +201,10 @@
 mkdir -p %{buildroot}%{_datadir}/pkgconfig/
 install -p -m 644 %{name}.pc %{buildroot}%{_datadir}/pkgconfig/
 
+# install desktop file
+desktop-file-install --vendor="fedora" \
+        --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
+
 %check
 
 # export test enviroment
@@ -231,15 +248,20 @@
 %files utils
 %defattr(-,root,root,-)
 %{_bindir}/shapeindex
+%{_bindir}/viewer
+%{_datadir}/applications/fedora-viewer.desktop
 
 %files demo
 %defattr(-,root,root,-)
 %doc demo/c++
-%doc demo/viewer
 %doc demo/data
 %doc demo/python demo/test
 
 %changelog
+* 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
+
 * Wed Sep 24 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.4.svn738
 - use relative path in a demo file
 - enable mapnik.pc