- Latest release update

.cvsignore

@@ -1 +1 @@
-clucene-core-0.9.16a.tar.bz2
+clucene-core-0.9.19.tar.bz2

clucene.spec

@@ -1,13 +1,19 @@
-Summary: A C++ port of Lucene
+%define build_contrib	0
-Name: clucene
+
-Version: 0.9.16a
+Summary:	A C++ port of Lucene
-Release: 2%{?dist}
+Name:		clucene
-License: LGPL or ASL 2.0
+Version:	0.9.19
-Group: Development/System
+Release:	1%{?dist}
-URL: http://www.sourceforge.net/projects/clucene
+License:	LGPL or ASL 2.0
-Source: http://easynews.dl.sf.net/clucene/clucene-core-%{version}.tar.bz2
+Group:		Development/System
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:		http://www.sourceforge.net/projects/clucene
-BuildRequires: automake
+Source0:	http://easynews.dl.sf.net/clucene/clucene-core-%{version}.tar.bz2
+%if %{build_contrib}
+Source1:	http://easynews.dl.sf.net/clucene/clucene-contrib-0.9.16a.tar.bz2
+Patch1:		clucene-contrib-autoconf.patch
+%endif
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	automake
 
 %description
 CLucene is a C++ port of Lucene.
@@ -16,46 +22,106 @@ engine written in C++. CLucene is faster than lucene
 as it is written in C++
 
 %package core
-Summary: Core clucene module
+Summary:	Core clucene module
-Group: Development/System
+Group:		Development/System
-Provides: clucene
+Provides:	clucene
+#Requires: %{name} = %{version}-%{release}
 
 %description core
 The core clucene module
 
 %package core-devel
-Summary: Headers for developing programs that will use %{name}
+Summary:	Headers for developing programs that will use %{name}
-Group: Development/Libraries
+Group:		Development/Libraries
-Requires: %{name}-core = %{version}-%{release}
+Requires:	%{name}-core = %{version}-%{release}
 
 %description core-devel
 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
-%setup -q -n clucene-core-%{version}
+%if %{build_contrib}
+%setup -q -c -a 1
+cd %{name}-contrib-%{version}
+%patch1 -p0 -b .autoconf
+%else
+%setup -q -c -a 0
+%endif
 
 %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
+%endif
 
 # Run the tests
 %check
+pushd %{name}-core-%{version}
 make check
+popd
 										
 %install
 rm -rf %{buildroot}
+pushd %{name}-core-%{version}
 make DESTDIR=%{buildroot} install
+popd
+
+%if %{build_contrib}
+pushd %{name}-contrib-%{version}
+make DESTDIR=%{buildroot} install
+popd
+%endif
 
 #Hope upstream will correct this problem in the next release
 mv %{buildroot}%{_libdir}/CLucene/clucene-config.h  %{buildroot}%{_includedir}/CLucene/
+%if %{build_contrib}
+mv %{buildroot}%{_libdir}/CLucene/clucene-config-contrib.h  %{buildroot}%{_includedir}/CLucene/
+%endif
 rm -rf %{buildroot}%{_libdir}/CLucene
 
 #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 \
+       %{buildroot}%{_datadir}/doc/%{name}-%{version}
+popd
 
 rm -rf %{buildroot}%{_libdir}/*.la
+# These are from the contrib package
+rm -rf %{buildroot}%{_includedir}/CuTest.h
+rm -rf %{buildroot}%{_includedir}/test.h
 
 %clean
 rm -rf %{buildroot}
@@ -66,22 +132,51 @@ rm -rf %{buildroot}
 
 %files core
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING HACKING README REQUESTS
+#%doc AUTHORS COPYING HACKING README REQUESTS
-%{_libdir}/*.so.*
+%{_libdir}/libclucene.so.*
+%{_datadir}/doc/%{name}-%{version}/
 
 %files core-devel
 %defattr(-, root, root, -)
-%{_includedir}/CLucene/
+%dir %{_includedir}/CLucene
+%{_includedir}/CLucene/*
 %{_includedir}/CLucene.h
-%{_libdir}/*.so
+%{_libdir}/libclucene.so
 %{_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, -)
+%{_includedir}/CLucene/clucene-config-contrib.h
+%{_includedir}/CLucene/analysis/cjk/
+%{_includedir}/CLucene/highlighter/
+%{_includedir}/CLucene/jstreams/
+%{_includedir}/CLucene/snowball/
+%{_libdir}/libclucene-contrib.so
+%endif
 
 %changelog
+* Sat Aug 11 2007 Deji Akingunola <dakingun@gmail.com> - 0.9.19-1
+- Latest release update
+
 * Fri Aug 03 2007 Deji Akingunola <dakingun@gmail.com> - 0.9.16a-2
 - License tag update
 
+* Thu Feb 22 2007 Deji Akingunola <dakingun@gmail.com> - 0.9.16a-2
+- Add -contrib subpackage 
+
 * Thu Dec 07 2006 Deji Akingunola <dakingun@gmail.com> - 0.9.16a-1
-- Name the built package clucene-core to conform to upstream naming
 - Update to latest stable release 
 - Run make check during build
 

sources

@@ -1 +1 @@
-0ed4f537321065c68ed802be67b25b10  clucene-core-0.9.16a.tar.bz2
+5ae4e6c37319daf0a6001175df01fdf8  clucene-core-0.9.19.tar.bz2