rpms/mapnik/F-8 import.log,1.2,1.3 mapnik.spec,1.2,1.3

[Balint Cristian]

Author: rezso

Update of /cvs/pkgs/rpms/mapnik/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8549/F-8

Modified Files:
	import.log mapnik.spec 
Log Message:
- use relative path in a demo file
- enable mapnik.pc
 ----------------------------------------------------------------------
 Modified Files:
 	F-8/import.log F-8/mapnik.spec 
 ----------------------------------------------------------------------



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-8/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Sep 2008 08:43:06 -0000	1.2
+++ import.log	25 Sep 2008 11:33:24 -0000	1.3
@@ -1,2 +1,3 @@
 mapnik-0_5_1-4_fc9:F-8:mapnik-0.5.1-4.fc9.src.rpm:1219680658
 mapnik-0_5_2-0_3_svn738_fc10:F-8:mapnik-0.5.2-0.3.svn738.fc10.src.rpm:1221208908
+mapnik-0_5_2-0_4_svn738_fc10:F-8:mapnik-0.5.2-0.4.svn738.fc10.src.rpm:1222342368


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/F-8/mapnik.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapnik.spec	12 Sep 2008 08:43:06 -0000	1.2
+++ mapnik.spec	25 Sep 2008 11:33:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.5.2
-Release:   0.3.svn738%{?dist}
+Release:   0.4.svn738%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -86,6 +86,7 @@
 Group:    Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
 Requires: %{name}-python = %{version}-%{release}
+Requires: freetype-devel
 
 %description demo
 Demo application and sample vector datas distributed with the Mapnik
@@ -122,6 +123,9 @@
 chmod -x demo/data/test/regenerate.sh
 find . -type d -perm /g+s -exec chmod -s '{}' \;
 
+# fix wrong path in a demo file
+sed -i -e 's|/lib/mapnik/input/|/%{name}/input/|g' demo/c++/rundemo.cpp
+
 %build
 
 # linkage errors
@@ -168,6 +172,22 @@
 install -p -m 755 utils/stats/mapdef_stats.py %{buildroot}%{_bindir}/
 install -p -m 644 %{SOURCE1} demo/data/
 
+# install pkgconfig file
+cat > %{name}.pc <<EOF
+prefix=%{_prefix}
+exec_prefix=%{_prefix}
+includedir=%{_includedir}
+
+Name: %{name}
+Description: Free Toolkit for developing mapping applications
+Version: %{version}
+Libs: -lmapnik
+Cflags: -I${includedir}/%{name} -I${includedir}/agg
+EOF
+
+mkdir -p %{buildroot}%{_datadir}/pkgconfig/
+install -p -m 644 %{name}.pc %{buildroot}%{_datadir}/pkgconfig/
+
 %check
 
 # export test enviroment
@@ -200,6 +220,7 @@
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 %{_libdir}/lib%{name}.so
+%{_datadir}/pkgconfig/%{name}.pc
 
 %files python
 %defattr(-,root,root,-)
@@ -219,6 +240,10 @@
 %doc demo/python demo/test
 
 %changelog
+* 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
+
 * Fri Sep 12 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.3.svn738
 - enable libicu wrap