rpms/clucene/EL-5 .cvsignore, 1.2, 1.3 clucene.spec, 1.2, 1.3 sources, 1.2, 1.3
Deji Akingunola
deji at fedoraproject.org
Mon Oct 26 21:58:53 UTC 2009
Author: deji
Update of /cvs/pkgs/rpms/clucene/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18150
Modified Files:
.cvsignore clucene.spec sources
Log Message:
* Mon Oct 26 2009 Deji Akingunola <dakingun at gmail.com> - 0.9.21b-1
- Build for RHEL5 and clones (in EPEL)
- Update to version 0.9.21b
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clucene/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 13 Dec 2006 17:09:38 -0000 1.2
+++ .cvsignore 26 Oct 2009 21:58:52 -0000 1.3
@@ -1 +1 @@
-clucene-core-0.9.16a.tar.bz2
+clucene-core-0.9.21b.tar.bz2
Index: clucene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clucene/EL-5/clucene.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- clucene.spec 18 Dec 2006 21:46:13 -0000 1.2
+++ clucene.spec 26 Oct 2009 21:58:53 -0000 1.3
@@ -1,13 +1,19 @@
-Summary: A C++ port of Lucene
-Name: clucene
-Version: 0.9.16a
-Release: 1%{?dist}
-License: LGPL
-Group: Development/System
-URL: http://www.sourceforge.net/projects/clucene
-Source: http://easynews.dl.sf.net/clucene/clucene-core-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake
+%define build_contrib 0
+
+Summary: A C++ port of Lucene
+Name: clucene
+Version: 0.9.21b
+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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: automake gawk
%description
CLucene is a C++ port of Lucene.
@@ -16,46 +22,102 @@ engine written in C++. CLucene is faster
as it is written in C++
%package core
-Summary: Core clucene module
-Group: Development/System
-Provides: clucene
+Summary: Core clucene module
+Group: Development/System
+Provides: clucene
+#Requires: %{name} = %{version}-%{release}
%description core
The core clucene module
%package core-devel
-Summary: Headers for developing programs that will use %{name}
-Group: Development/Libraries
-Requires: %{name}-core = %{version}-%{release}
+Summary: Headers for developing programs that will use %{name}
+Group: Development/Libraries
+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
-make check
-
%install
rm -rf %{buildroot}
+pushd %{name}-core-%{version}
make DESTDIR=%{buildroot} install
+popd
-#Hope upstream will correct this problem in the next release
-mv %{buildroot}%{_libdir}/CLucene/clucene-config.h %{buildroot}%{_includedir}/CLucene/
-rm -rf %{buildroot}%{_libdir}/CLucene
+%if %{build_contrib}
+pushd %{name}-contrib-%{version}
+make DESTDIR=%{buildroot} install
+popd
+%endif
#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
+
+# Run the tests
+## It currently fails 2 tests for ppc64 builds, upstream is looking into it.
+%ifarch %{ix86} x86_64
+%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
%clean
rm -rf %{buildroot}
@@ -66,19 +128,78 @@ rm -rf %{buildroot}
%files core
%defattr(-, root, root, -)
-%doc AUTHORS COPYING HACKING README REQUESTS
-%{_libdir}/*.so.*
+#%doc AUTHORS COPYING HACKING README REQUESTS
+%{_libdir}/libclucene.so.*
+%{_datadir}/doc/%{name}-%{version}/
%files core-devel
%defattr(-, root, root, -)
-%{_includedir}/CLucene/
+%dir %{_includedir}/CLucene
+%dir %{_libdir}/CLucene
+%{_includedir}/CLucene/*
%{_includedir}/CLucene.h
-%{_libdir}/*.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
%changelog
+* Mon Oct 26 2009 Deji Akingunola <dakingun at gmail.com> - 0.9.21b-1
+- Build for RHEL5 and clones (in EPEL)
+- Update to version 0.9.21b
+
+* Tue Apr 14 2009 Karsten Hopp <karsten at redhat.com> 0.9.21-3
+- bypass 'make check' on s390x, similar to ppc64
+
+* Wed Aug 27 2008 Deji Akingunola <dakingun at gmail.com> - 0.9.21-1
+- Update to version 0.9.21
+
+* Sun Feb 10 2008 Deji Akingunola <dakingun at gmail.com> - 0.9.20-4
+- Rebuild for gcc43
+
+* Wed Oct 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.20-3
+- Fix a typo in the License field
+
+* Wed Oct 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.20-2
+- Fix multiarch conflicts (BZ #340891)
+- Bypass 'make check' for ppc64, its failing two tests there
+
+* Tue Aug 21 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.20-1
+- Update to version 0.9.20
+
+* Sat Aug 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.19-1
+- Latest release update
+
+* Fri Aug 03 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.16a-2
+- License tag update
+
+* Thu Feb 22 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.16a-2
+- Add -contrib subpackage
+
* Thu Dec 07 2006 Deji Akingunola <dakingun at 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clucene/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 13 Dec 2006 17:09:38 -0000 1.2
+++ sources 26 Oct 2009 21:58:53 -0000 1.3
@@ -1 +1 @@
-0ed4f537321065c68ed802be67b25b10 clucene-core-0.9.16a.tar.bz2
+ba1a8f764a2ca19c66ad907dddd88352 clucene-core-0.9.21b.tar.bz2
More information about the fedora-extras-commits
mailing list