[mapserver] Final changes for 6.0. This version builds fine.:

Devrim GÜNDÜZ devrim at fedoraproject.org
Tue Jul 19 14:19:00 UTC 2011


commit b8f86d5001e3f57340fd11a6e5ba913686f829e2
Author: Devrim GÜNDÜZ <devrim at gunduz.org>
Date:   Tue Jul 19 17:18:12 2011 +0300

    Final changes for 6.0. This version builds fine.:

 mapserver.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/mapserver.spec b/mapserver.spec
index b017134..e58c696 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -93,6 +93,8 @@ popd
 
 %build
 
+CFLAGS="${CFLAGS} -ldl" ; export CFLAGS
+
 # fix a UTF-8 one
 iconv -f ISO-8859-1 -t UTF-8 < \
 mapscript/java/examples/QueryByAttributeUnicode.java > \
@@ -171,7 +173,7 @@ install -p -m 755 shptree %{buildroot}/%{_bindir}
 install -p -m 755 sortshp %{buildroot}/%{_bindir}
 install -p -m 755 tile4ms %{buildroot}/%{_bindir}
 
-install -p -m 755 mapscript/php3/php_mapscript.so %{buildroot}/%{_libdir}/php/modules/
+install -p -m 755 mapscript/php/php_mapscript.so %{buildroot}/%{_libdir}/php/modules/
 
 # install perl module
 pushd mapscript/perl
@@ -208,7 +210,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc README COMMITERS GD-COPYING HISTORY.TXT  
-%doc INSTALL MIGRATION_GUIDE.TXT
+%doc INSTALL MIGRATION_GUIDE.txt
 %doc symbols tests
 %doc fonts
 %{_bindir}/shp2img
@@ -219,8 +221,8 @@ rm -rf %{buildroot}
 
 %files -n php-mapserver
 %defattr(-,root,root)
-%doc mapscript/php3/README
-%doc mapscript/php3/examples
+%doc mapscript/php/README
+%doc mapscript/php/examples
 %config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
 %{_libdir}/php/modules/php_mapscript.so
 
@@ -250,6 +252,7 @@ rm -rf %{buildroot}
 - Update to 6.0.1, for various fixes described at:
   http://trac.osgeo.org/mapserver/browser/tags/rel-6-0-1/mapserver/HISTORY.TXT
 - Fixes bz #722545
+- Apply changes to spec file for new major version.
 
 * Fri Jun 17 2011 Marcela Mašláňová <mmaslano at redhat.com> - 5.6.5-6
 - Perl mass rebuild


More information about the scm-commits mailing list