[Falcon] - Update to 0.9.6.6

[Michel Alexandre Salim]

commit 56f20cb69cd792292686b525a6bf9129e72d3da4
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Nov 6 02:55:08 2010 +0100

    - Update to 0.9.6.6

 .gitignore  |    6 +++---
 Falcon.spec |   47 +++++++++++++++++++++++++++++++----------------
 sources     |    6 +++---
 3 files changed, 37 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d77aef7..a03a687 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-Falcon-0.9.4.2.tar.gz
-Falcon-docs-core.0.9.4.2.tgz
-Falcon-feathers-docs.0.9.4.2.tgz
+/Falcon-0.9.6.6.tgz
+/Falcon-docs-core.0.9.6.4.tar.gz
+/Falcon-feathers-docs.0.9.6.4.tar.gz
diff --git a/Falcon.spec b/Falcon.spec
index 4a56d92..1f41571 100644
--- a/Falcon.spec
+++ b/Falcon.spec
@@ -1,7 +1,10 @@
 %global host     www.falconpl.org
+# latest bugfix release does not come with updated docs
+# remove once the releases are synced again
+%global docver   0.9.6.4
 
 Name:            Falcon
-Version:         0.9.4.2
+Version:         0.9.6.6
 Release:         1%{?dist}
 Summary:         The Falcon Programming Language
 Summary(it):     Il linguaggio di programmazione Falcon
@@ -9,12 +12,15 @@ Summary(it):     Il linguaggio di programmazione Falcon
 License:        GPLv2+
 Group:          Development/Languages
 URL:            http://%{host}/
-Source0:        http://%{host}/project_dl/_official_rel/%{name}-%{version}.tar.gz
-Source1:        http://%{host}/project_dl/_official_rel/%{name}-docs-core.%{version}.tgz
-Source2:        http://%{host}/project_dl/_official_rel/%{name}-feathers-docs.%{version}.tgz
+Source0:        http://%{host}/project_dl/_official_rel/%{name}-%{version}.tgz
+Source1:        http://%{host}/project_dl/_official_rel/%{name}-docs-core.%{docver}.tar.gz
+Source2:        http://%{host}/project_dl/_official_rel/%{name}-feathers-docs.%{docver}.tar.gz
+# emailed to author
+Patch0:         Falcon-0.9.6.6-honor-cmake-dir.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:  bison cmake pcre-devel zlib-devel
+BuildRequires:  cmake pcre-devel zlib-devel
 
 %description
 The Falcon Programming Language is an embeddable scripting language
@@ -68,26 +74,32 @@ This package contains HTML documentation for %{name}.
 
 %prep
 %setup -q -a1 -a2
+%patch0 -p1 -b .honor-cmake-dir
 mkdir largedocs
-mv Falcon-docs-core.0.9.4 largedocs/core
-mv Falcon-feathers-docs.%{version} largedocs/feathers
+mv Falcon-docs-core.%{docver} largedocs/core
+mv Falcon-feathers-docs.%{docver} largedocs/feathers
 
 
 %build
-CXXFLAGS="$RPM_OPT_FLAGS -w" CFLAGS="$RPM_OPT_FLAGS -w" ./build.sh \
-  -p $RPM_BUILD_ROOT%{_prefix} -f %{_prefix} -l %{_lib} %{?_smp_flags}
+%cmake . -DFALCON_LIB_DIR=%{_lib} \
+       -DFALCON_CMAKE_DIR=%{_lib}/falcon/cmake \
+       -DFALCON_SHARE_DIR=share/doc/Falcon-%{version}
+
+make VERBOSE=1 %{?_smp_flags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-./build.sh -i
+make install DESTDIR=$RPM_BUILD_ROOT
+# so that this directory is available for third-party apps
+mkdir $RPM_BUILD_ROOT%{_libdir}/falcon/apps
 # with cmake-2.6, the default install target misses some files
-[ -f $RPM_BUILD_ROOT%{_bindir}/faltest ] || \
-  (cd devel/release/build/core && make install && \
-   cd ../modules/feathers && make install)
+#[ -f $RPM_BUILD_ROOT%{_bindir}/faltest ] || \
+#  (cd devel/release/build/core && make install && \
+#   cd ../modules/feathers && make install)
 # Fix falconeer script
-sed -i "s|#!/bin/falcon|#!%{_bindir}/falcon|" \
-  $RPM_BUILD_ROOT%{_bindir}/falconeer.fal
+#sed -i "s|#!/bin/falcon|#!%{_bindir}/falcon|" \
+#  $RPM_BUILD_ROOT%{_bindir}/falconeer.fal
 
 
 %clean
@@ -100,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog copyright README RELNOTES LICENSE LICENSE_GPLv2
+%doc %{_datadir}/doc/Falcon-%{version}
 %exclude %{_bindir}/falcon-conf
 %exclude %{_bindir}/falconeer.fal
 %exclude %{_bindir}/faltest
@@ -130,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov  5 2010 Michel Salim <salimma at fedoraproject.org> - 0.9.6.6-1
+- Update to 0.9.6.6
+
 * Wed Sep 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.4.2-1
 - Update to 0.9.4.2
 - Package documentation files
diff --git a/sources b/sources
index 85cc6fd..97d6c06 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-00d19cef885e25bcbf8851add5bd0528  Falcon-0.9.4.2.tar.gz
-6bd7651311f04903212a80040bc58c90  Falcon-docs-core.0.9.4.2.tgz
-ca04eeb4c3e75eed2b73e7d84b8ca2c3  Falcon-feathers-docs.0.9.4.2.tgz
+50ea7d97ec7599d6e75a6b8b5b8c685a  Falcon-0.9.6.6.tgz
+94c5b17af5b9e06e4d97d497c292aad0  Falcon-docs-core.0.9.6.4.tar.gz
+42ffa8650cf5a86e426837c38977ea5a  Falcon-feathers-docs.0.9.6.4.tar.gz