[clucene] Update to version 2.3.3.4

Fri Jun 3 03:33:21 UTC 2011

commit d93c62be6bcdb45a0b79b77f3db23ddd2a361761
Author: Deji Akingunola <dakingun at mail.com>
Date:   Thu Jun 2 23:34:39 2011 -0400

    Update to version 2.3.3.4

 .gitignore   |    1 +
 clucene.spec |  148 ++++++++++++++-------------------------------------------
 sources      |    2 +-
 3 files changed, 39 insertions(+), 112 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 6676c2d..a71e708 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 clucene-core-0.9.21b.tar.bz2
+/clucene-core-2.3.3.4.tar.gz
diff --git a/clucene.spec b/clucene.spec
index d5fdd2f..d61a0c3 100644
--- a/clucene.spec
+++ b/clucene.spec
@@ -1,25 +1,20 @@
-%define build_contrib	0
-
 Summary:	A C++ port of Lucene
 Name:		clucene
-Version:	0.9.21b
-Release:	3%{?dist}
+Version:	2.3.3.4
+Release:	1%{?dist}
 License:	LGPLv2+ or ASL 2.0
 Group:		Development/System
 URL:		http://www.sourceforge.net/projects/clucene
-Source0:	http://downloads.sourceforge.net/clucene/clucene-core-%{version}.tar.bz2
-%if %{build_contrib}
-Source1:	http://downloads.sourceforge.net/clucene/clucene-contrib-0.9.16a.tar.bz2
-Patch1:		clucene-contrib-autoconf.patch
-%endif
+Source0:	http://downloads.sourceforge.net/clucene/clucene-core-2.3.3.4.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	automake gawk
+BuildRequires:	automake gawk cmake zlib-devel boost-devel
 
 %description
-CLucene is a C++ port of Lucene.
-It is a high-performance, full-featured text search 
-engine written in C++. CLucene is faster than lucene
-as it is written in C++
+CLucene is a C++ port of the popular Apache Lucene search engine
+(http://lucene.apache.org/java). 
+CLucene aims to be a high-speed alternative to Java Lucene, its API is very
+similar to that of the Java version. CLucene has recently been brought up to
+date with Lucene 2.3.2. It contains most of the same functionality as the Java version.
 
 %package core
 Summary:	Core clucene module
@@ -39,85 +34,37 @@ Requires:	%{name}-core = %{version}-%{release}
 This package contains the static libraries and header files needed for
 developing with clucene
 
-%if %{build_contrib}
-%package	contrib
-Summary:	Core clucene module
-Group:		Development/System
-Requires:	%{name}-core >= %{version}-%{release}
-
-%description contrib
-Collection of contributions for C++ port of Lucene
-
-%package contrib-devel
-Summary:	Headers for developing programs that will use %{name}
-Group:		Development/Libraries
-Requires:	%{name}-contrib = %{version}-%{release}
-Requires:	%{name}-core-devel >= %{version}-%{release}
-
-%description contrib-devel
-This package contains the static libraries and header files needed for
-developing with clucene-contrib
-%endif
-
 %prep
-%if %{build_contrib}
-%setup -q -c -a 1
-cd %{name}-contrib-%{version}
-%patch1 -p0 -b .autoconf
-%else
-%setup -q -c -a 0
-%endif
+%setup -n %{name}-core-%{version}
 
 %build
-pushd %{name}-core-%{version}
-%configure --disable-static
-make %{?_smp_mflags}
-popd
-
-%if %{build_contrib}
-pushd %{name}-contrib-%{version}
-aclocal -I m4
-autoconf
-automake --add-missing --copy
-%configure --disable-static
-make %{?_smp_mflags}
-popd
+mkdir fedora
+cd fedora
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+export FFLAGS="%{optflags}"
+%ifarch x86_64 ppc64
+%define lib_suffix 64
+%else
+%define lib_suffix %{nil}
 %endif
+cmake	-DCMAKE_INSTALL_PREFIX=%{_prefix}				\
+	-DLIB_DESTINATION=%{_libdir}  -DLIB_SUFFIX=%{lib_suffix}	\
+	-DLUCENE_SYS_INCLUDES=%{_libdir}				\
+	..
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-pushd %{name}-core-%{version}
+cd fedora
 make DESTDIR=%{buildroot} install
-popd
 
-%if %{build_contrib}
-pushd %{name}-contrib-%{version}
-make DESTDIR=%{buildroot} install
-popd
-%endif
+rm -rf %{buildroot}%{_libdir}/CLuceneConfig.cmake
 
-#Package the docs
-mkdir -p %{buildroot}%{_datadir}/%{name}/doc
-mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}
-pushd %{name}-core-%{version}
-cp -pr doc/*.htm doc/*.jpg %{buildroot}%{_datadir}/%{name}/doc
-cp -pr AUTHORS COPYING HACKING README REQUESTS APACHE.license LGPL.license \
-       %{buildroot}%{_datadir}/doc/%{name}-%{version}
-popd
-
-# Run the tests 
-## It currently fails 2 tests for ppc64 builds, upstream is looking into it.
-%ifnarch ppc64 s390x sparc64
 %check
-pushd %{name}-core-%{version}
-make check
-popd
-%endif
-
-rm -rf %{buildroot}%{_libdir}/*.la
-# These are from the contrib package
-rm -rf %{buildroot}%{_includedir}/CuTest.h
-rm -rf %{buildroot}%{_includedir}/test.h
+cd fedora
+make cl_test
+make test
 
 %clean
 rm -rf %{buildroot}
@@ -128,9 +75,8 @@ rm -rf %{buildroot}
 
 %files core
 %defattr(-, root, root, -)
-#%doc AUTHORS COPYING HACKING README REQUESTS
-%{_libdir}/libclucene.so.*
-%{_datadir}/doc/%{name}-%{version}/
+%doc APACHE.license AUTHORS ChangeLog COPYING LGPL.license README
+%{_libdir}/libclucene*.so.*
 
 %files core-devel
 %defattr(-, root, root, -)
@@ -138,35 +84,15 @@ rm -rf %{buildroot}
 %dir %{_libdir}/CLucene
 %{_includedir}/CLucene/*
 %{_includedir}/CLucene.h
-%{_libdir}/libclucene.so
+%{_libdir}/libclucene*.so
 %{_libdir}/CLucene/clucene-config.h
-%{_datadir}/%{name}/
-%if %{build_contrib}
-%exclude %{_includedir}/CLucene/clucene-config-contrib.h
-%exclude %{_includedir}/CLucene/analysis/cjk/
-%exclude %{_includedir}/CLucene/highlighter/
-%exclude %{_includedir}/CLucene/jstreams/
-%exclude %{_includedir}/CLucene/snowball/
-%endif
-
-%if %{build_contrib}
-%files contrib
-%defattr(-, root, root, -)
-%{_libdir}/libclucene-contrib.so.*
-
-%files contrib-devel
-%defattr(-, root, root, -)
-%dir %{_libdir}/CLucene
-%{_includedir}/CLucene/clucene-config-contrib.h
-%{_includedir}/CLucene/analysis/cjk/
-%{_includedir}/CLucene/highlighter/
-%{_includedir}/CLucene/jstreams/
-%{_includedir}/CLucene/snowball/
-%{_libdir}/libclucene-contrib.so
-%{_libdir}/CLucene/clucene-config-contrib.h
-%endif
+%{_libdir}/CLucene/CLuceneConfig.cmake
+%{_libdir}/pkgconfig/libclucene-core.pc
 
 %changelog
+* Thu Jun 02 2011 Deji Akingunola <dakingun at gmail.com> - 2.3.3.4-1
+- Update to version 2.3.3.4
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.21b-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 430bbd4..e1e0cf0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba1a8f764a2ca19c66ad907dddd88352  clucene-core-0.9.21b.tar.bz2
+48d647fbd8ef8889e5a7f422c1bfda94  clucene-core-2.3.3.4.tar.gz
