[Falcon] Update to 0.9.6.8
Michel Alexandre Salim
salimma at fedoraproject.org
Tue Mar 6 14:55:41 UTC 2012
commit 9d5d4b54f50c0a52a2b078ed94f8972bb9410876
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Tue Mar 6 21:55:20 2012 +0700
Update to 0.9.6.8
.gitignore | 5 +-
Falcon-0.9.6.6-honor-cmake-dir.patch | 19 -------
Falcon-0.9.6.8-mongo-cmake-linux-x64.patch | 75 ++++++++++++++++++++++++++++
Falcon-0.9.6.8-mongo-stdint.patch | 36 +++++++++++++
Falcon.spec | 48 +++++++++---------
sources | 5 +-
6 files changed, 139 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a03a687..355ba54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/Falcon-0.9.6.6.tgz
-/Falcon-docs-core.0.9.6.4.tar.gz
-/Falcon-feathers-docs.0.9.6.4.tar.gz
+/Falcon-0.9.6.8.tgz
+/Falcon-docs-0.9.6.8.tgz
diff --git a/Falcon-0.9.6.8-mongo-cmake-linux-x64.patch b/Falcon-0.9.6.8-mongo-cmake-linux-x64.patch
new file mode 100644
index 0000000..8385ca0
--- /dev/null
+++ b/Falcon-0.9.6.8-mongo-cmake-linux-x64.patch
@@ -0,0 +1,75 @@
+From 64526ea7d3b5ec04f398bd28cb4e505e6a0f3218 Mon Sep 17 00:00:00 2001
+From: Stanislas Marquis <stnsls at gmail.com>
+Date: Sun, 9 Jan 2011 08:40:00 +0100
+Subject: [PATCH] [mongo] [cmake] Fix problems with Linux x64.
+
+---
+ modules/native/mongodb/CMakeLists.txt | 11 +++++++++--
+ modules/native/mongodb/mongodb_mod.cpp | 2 +-
+ modules/native/mongodb/src/CMakeLists.txt | 8 ++++++--
+ 3 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/modules/native/mongodb/CMakeLists.txt b/modules/native/mongodb/CMakeLists.txt
+index ba7e5cf..bf2d869 100644
+--- a/modules/native/mongodb/CMakeLists.txt
++++ b/modules/native/mongodb/CMakeLists.txt
+@@ -8,6 +8,10 @@ falcon_define_module( FALCON_MODULE mongo )
+
+ message( STATUS "Adding mongodb module" )
+
++if ( NOT MSVC )
++ option( MONGO_HAVE_STDINT "MongoDB problem with int64_t?" OFF )
++endif()
++
+ ##
+ # Find Falcon
+ #
+@@ -28,8 +32,11 @@ add_subdirectory( src )
+ if ( MSVC )
+ add_definitions( -DMONGO_USE__INT64 )
+ else()
+- #add_definitions( -DMONGO_HAVE_STDINT )
+- add_definitions( -DMONGO_USE_LONG_LONG_INT )
++ if ( MONGO_HAVE_STDINT )
++ add_definitions( -DMONGO_HAVE_STDINT )
++ else()
++ add_definitions( -DMONGO_USE_LONG_LONG_INT )
++ endif()
+ endif()
+
+ ##
+diff --git a/modules/native/mongodb/mongodb_mod.cpp b/modules/native/mongodb/mongodb_mod.cpp
+index 6102664..4d47fac 100644
+--- a/modules/native/mongodb/mongodb_mod.cpp
++++ b/modules/native/mongodb/mongodb_mod.cpp
+@@ -1321,7 +1321,7 @@ BSONIter::makeItem( const bson_type tp,
+ //...
+ break;
+ case bson_long:
+- it = new Item( bson_iterator_long_raw( iter ) );
++ it = new Item( (int64) bson_iterator_long_raw( iter ) );
+ break;
+ case bson_eoo:
+ default:
+diff --git a/modules/native/mongodb/src/CMakeLists.txt b/modules/native/mongodb/src/CMakeLists.txt
+index 48cdaef..d883af3 100644
+--- a/modules/native/mongodb/src/CMakeLists.txt
++++ b/modules/native/mongodb/src/CMakeLists.txt
+@@ -7,8 +7,12 @@ include_directories( BEFORE . )
+ if ( MSVC )
+ add_definitions( -DMONGO_USE__INT64 )
+ else()
+- add_definitions( -DMONGO_USE_LONG_LONG_INT )
+- #add_definitions( --std=c99 )
++ add_definitions( -fPIC )
++ if ( MONGO_HAVE_STDINT )
++ add_definitions( -DMONGO_HAVE_STDINT )
++ else()
++ add_definitions( -DMONGO_USE_LONG_LONG_INT )
++ endif()
+ endif()
+
+ set( MONGO_SRCS
+--
+1.7.9.1
+
diff --git a/Falcon-0.9.6.8-mongo-stdint.patch b/Falcon-0.9.6.8-mongo-stdint.patch
new file mode 100644
index 0000000..0f688b2
--- /dev/null
+++ b/Falcon-0.9.6.8-mongo-stdint.patch
@@ -0,0 +1,36 @@
+From a64c0c3959a0f5e853daba2b35ca19459acf875e Mon Sep 17 00:00:00 2001
+From: Stanislas Marquis <stnsls at gmail.com>
+Date: Sat, 29 Jan 2011 12:27:50 +0100
+Subject: [PATCH] [mongo] Fix detection of stdint.h
+
+---
+ modules/native/mongodb/CMakeLists.txt | 12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/modules/native/mongodb/CMakeLists.txt b/modules/native/mongodb/CMakeLists.txt
+index bf2d869..e4d1df6 100644
+--- a/modules/native/mongodb/CMakeLists.txt
++++ b/modules/native/mongodb/CMakeLists.txt
+@@ -8,8 +8,18 @@ falcon_define_module( FALCON_MODULE mongo )
+
+ message( STATUS "Adding mongodb module" )
+
++##
++# Check for stdint.h
++#
+ if ( NOT MSVC )
+- option( MONGO_HAVE_STDINT "MongoDB problem with int64_t?" OFF )
++ find_file( STDINT_H stdint.h HINTS /usr/include )
++ if ( STDINT_H STREQUAL STDINT_H-NOTFOUND )
++ option( MONGO_HAVE_STDINT "MongoDB should use stdint.h" OFF )
++ else()
++ option( MONGO_HAVE_STDINT "MongoDB should use stdint.h" ON )
++ endif()
++ mark_as_advanced( STDINT_H )
++ mark_as_advanced( MONGO_HAVE_STDINT )
+ endif()
+
+ ##
+--
+1.7.9.1
+
diff --git a/Falcon.spec b/Falcon.spec
index d6f997b..a5f9cc5 100644
--- a/Falcon.spec
+++ b/Falcon.spec
@@ -1,11 +1,11 @@
%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
+%global docver %{version}
Name: Falcon
-Version: 0.9.6.6
-Release: 4%{?dist}
+Version: 0.9.6.8
+Release: 1%{?dist}
Summary: The Falcon Programming Language
Summary(it): Il linguaggio di programmazione Falcon
@@ -13,14 +13,18 @@ License: GPLv2+
Group: Development/Languages
URL: http://%{host}/
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
+Source1: http://%{host}/project_dl/_official_rel/%{name}-docs-%{docver}.tgz
+# Patches from Git for Falcon's mongo modules
+Patch0: Falcon-0.9.6.8-mongo-cmake-linux-x64.patch
+Patch1: Falcon-0.9.6.8-mongo-stdint.patch
+%if 0%{?rhel} <= 5
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+%endif
-BuildRequires: cmake pcre-devel zlib-devel
+BuildRequires: cmake pcre-devel
+BuildRequires: sqlite-devel
+BuildRequires: zlib-devel
%description
The Falcon Programming Language is an embeddable scripting language
@@ -43,6 +47,7 @@ semplice e potente.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: cmake
%description devel
The Falcon Programming Language is an embeddable scripting language
@@ -73,17 +78,18 @@ This package contains HTML documentation for %{name}.
%prep
-%setup -q -a1 -a2
-%patch0 -p1 -b .honor-cmake-dir
+%setup -q -a1
+%patch0 -p1 -b .mongo-cmake-linux-x64
+%patch1 -p1 -b .mongo-stdint
mkdir largedocs
-mv Falcon-docs-core.%{docver} largedocs/core
-mv Falcon-feathers-docs.%{docver} largedocs/feathers
+mv %{docver}-html largedocs
%build
-%cmake . -DFALCON_LIB_DIR=%{_lib} \
- -DFALCON_CMAKE_DIR=%{_lib}/falcon/cmake \
+%cmake . \
-DFALCON_SHARE_DIR=share/doc/Falcon-%{version}
+#-DFALCON_LIB_DIR=%{_lib} \
+# -DFALCON_CMAKE_DIR=%{_lib}/falcon/cmake \
make VERBOSE=1 %{?_smp_flags}
@@ -91,15 +97,6 @@ make VERBOSE=1 %{?_smp_flags}
%install
rm -rf $RPM_BUILD_ROOT
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)
-# Fix falconeer script
-#sed -i "s|#!/bin/falcon|#!%{_bindir}/falcon|" \
-# $RPM_BUILD_ROOT%{_bindir}/falconeer.fal
%clean
@@ -131,6 +128,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/faltest
%{_includedir}/*
%{_libdir}/*.so
+%{_datadir}/cmake/faldoc
%{_mandir}/man1/falcon-conf*
%{_mandir}/man1/falconeer.fal*
%{_mandir}/man1/faltest*
@@ -140,8 +138,10 @@ rm -rf $RPM_BUILD_ROOT
%doc largedocs/*
-
%changelog
+* Tue Mar 6 2012 Michel Salim <salimma at fedoraproject.org> - 0.9.6.8-1
+- Update to 0.9.6.8
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6.6-4
- Rebuilt for c++ ABI breakage
diff --git a/sources b/sources
index 97d6c06..c817be8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-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
+8435f6f2fe95097ac2fbe000da97c242 Falcon-0.9.6.8.tgz
+235cbe8d5f099cb91a0cc92efc5050d4 Falcon-docs-0.9.6.8.tgz
More information about the scm-commits
mailing list