[grass] UPDATE FOR 6.4.1

[Volker Fröhlich]

commit c0b315400c483b6fc89f7594cee6b4d0c2a1582f
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Wed Sep 21 01:00:52 2011 +0200

    UPDATE FOR 6.4.1
    
    - Slight cleanups (include paths, lib paths)
    - Remove hack for ncurses
    - Support Geos

 grass.spec |   71 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 35 insertions(+), 36 deletions(-)
---
diff --git a/grass.spec b/grass.spec
index 00f5877..76d7d2e 100644
--- a/grass.spec
+++ b/grass.spec
@@ -9,8 +9,8 @@
 
 
 Name:      grass
-Version:   6.4.0
-Release:   4%{?dist}
+Version:   6.4.1
+Release:   1%{?dist}
 Summary:   GRASS - Geographic Resources Analysis Support System
 Group:     Applications/Engineering
 License:   GPLv2+
@@ -74,20 +74,15 @@ GRASS (Geographic Resources Analysis Support System) development headers.
 
 %prep
 
-# Version
-a=`echo %{version}|sed 's/\([[:digit:]]\)\+$//g'|sed 's/\.//g'`
-
 %setup -q
+#TODO: Review the pkgconfig file
 %patch0 -p0 -b .pkgconf~
 %patch1 -p0 -b .shlibver~
 
-# remove the swap file
-# Note: Gone in 6.4.1
-rm -rf doc/.howto_release.txt.swp
-
 # readline requires ncurses, so workaround
 # correct mysql_config query
-sed -i 's|-lreadline|-lreadline -lcurses|g' configure
+#TODO: Seemingly not necessary
+#sed -i 's|-lreadline|-lreadline -lcurses|g' configure
 sed -i 's|--libmysqld-libs|--libs|g' configure
 
 # preserve timestamp during install process
@@ -105,6 +100,10 @@ for f in `find lib/vector/dglib -type f` ; do
   sed -i -e 's/02111-1307/02110-1301/' $f
 done
 
+#TODO: Create ticket on "shared lib calls exit"
+#TODO: Debug package without sources -- Something seems wrong with prefix here
+#Could be caused by:
+#-I/media/speicher1/makerpm/rpmbuild/BUILD/grass-6.4.1/dist.x86_64-unknown-linux-gnu/include
 
 %build
 
@@ -116,41 +115,33 @@ export INSTALL="%{__install} -c -p"
 export CFLAGS
 
 %configure \
+   --enable-largefile \
    --enable-shared \
-   --with-nls \
    --with-blas \
-   --with-lapack \
+   --with-cairo \
+   --with-cxx \
    --with-fftw \
+   --with-freetype-includes=%{_includedir}/freetype2 \
+   --with-freetype=yes \
    --with-gdal \
-   --with-proj \
-   --with-proj-includes=%{_includedir} \
-   --with-proj-libs=%{_libdir} \
-   --with-proj-share=%{_datadir}/proj \
-   --with-readline \
-   --with-readline-includes=%{_includedir}/readline \
-   --with-readline-libs=%{_libdir} \
-   --with-sqlite \
-   --with-odbc \
-   --with-odbc-libs=%{_libdir} \
-   --with-odbc-includes=%{_includedir} \
+   --with-geos \
+   --with-glw \
+   --with-lapack \
+   --with-motif \
    --with-mysql \
    --with-mysql-includes=%{_includedir}/mysql \
    --with-mysql-libs=%{_libdir}/mysql \
-   --with-postgres  \
-   --with-postgres-includes=%{_includedir}/pgsql \
-   --with-postgres-libs=%{_libdir} \
-   --with-freetype=yes \
-   --with-freetype-includes=%{_includedir}/freetype2 \
-   --with-motif \
+   --with-nls \
+   --with-odbc \
    --with-opengl \
-   --with-x \
-   --with-cairo \
-   --enable-largefile \
-   --with-cxx \
-   --with-wxwidgets=wx-config \
+   --with-postgres  \
+   --with-proj \
+   --with-proj-share=%{_datadir}/proj \
    --with-python \
-   --with-glw \
-   --with-glw-libs=%{_libdir} \
+   --with-readline \
+   --with-sqlite \
+   --with-wxwidgets=wx-config \
+   --with-x \
    %{configure_64_bit}
 
 make %{?_smp_mflags}
@@ -332,7 +323,15 @@ rm -rf %{buildroot}
 %{_includedir}/%{name}
 %{_libdir}/lib%{name}_*.so
 
+#TODO: Add Python example?
+
 %changelog
+* Tue Aug 02 2011 Volker Fröhlich <volker27 at gmx.at> - 6.4.1-1
+- Update to 6.4.1
+- Remove explicit lib and include dirs, where not necessary
+- Really build with geos
+- Remove sed call on ncurses
+
 * Tue Aug 02 2011 Volker Fröhlich <volker27 at gmx.at> - 6.4.0-4
 - Correct license to GPLv2+
 - Update URL