[hibernate-search] Upstream release 4.5.1.Final

[Marek Goldmann]

commit c96c23ce3c9b9e0d2a68e374e43bd62af704616f
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Thu Apr 17 14:33:46 2014 +0200

    Upstream release 4.5.1.Final

 .gitignore            |    1 +
 hibernate-search.spec |   39 ++++++++++++++++++++++++++++++++-------
 sources               |    2 +-
 3 files changed, 34 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 424b439..eff7192 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /hibernate-search-4.4.0.CR1-CLEAN.tar.gz
 /hibernate-search-4.5.0.Alpha2-CLEAN.tar.gz
 /hibernate-search-4.5.0.Final-CLEAN.tar.gz
+/hibernate-search-4.5.1.Final-CLEAN.tar.gz
diff --git a/hibernate-search.spec b/hibernate-search.spec
index 02e3638..dcce9f2 100644
--- a/hibernate-search.spec
+++ b/hibernate-search.spec
@@ -1,17 +1,21 @@
 %global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
 
+# Use this switch to rebuild without infinispan
+# This is useful to break the hibernate-search circular dependency
+%define with_infinispan 0
+
 Name:             hibernate-search
-Version:          4.5.0
-Release:          2%{?dist}
+Version:          4.5.1
+Release:          1%{?dist}
 Summary:          Hibernate Search
 License:          LGPLv2+
 Url:              http://search.hibernate.org
 
-# wget https://github.com/hibernate/hibernate-search/archive/4.5.0.Final.tar.gz
-# tar -xf 4.5.0.Final.tar.gz
-# rm -rf hibernate-search-4.5.0.Final/orm/src/test/resources/org/hibernate/search/test/bridge/tika/
-# tar -cvjf hibernate-search-4.5.0.Final-CLEAN.tar.gz hibernate-search-4.5.0.Final/
+# wget https://github.com/hibernate/hibernate-search/archive/4.5.1.Final.tar.gz
+# tar -xf 4.5.1.Final.tar.gz
+# rm -rf hibernate-search-4.5.1.Final/orm/src/test/resources/org/hibernate/search/test/bridge/tika/
+# tar -cvjf hibernate-search-4.5.1.Final-CLEAN.tar.gz hibernate-search-4.5.1.Final/
 Source0:          hibernate-search-%{namedversion}-CLEAN.tar.gz
 
 BuildRequires:    maven-local
@@ -21,8 +25,17 @@ BuildRequires:    avro
 BuildRequires:    jgroups
 BuildRequires:    slf4j
 BuildRequires:    jboss-transaction-1.1-api
+
+%if 0%{?fedora} >= 21
+BuildRequires:    lucene3
+BuildRequires:    lucene3-contrib
+BuildRequires:    solr3
+%else
 BuildRequires:    lucene
 BuildRequires:    lucene-contrib
+BuildRequires:    solr
+%endif
+
 BuildRequires:    h2
 BuildRequires:    maven-checkstyle-plugin
 BuildRequires:    maven-processor-plugin
@@ -32,10 +45,12 @@ BuildRequires:    hibernate-commons-annotations
 BuildRequires:    hibernate-jpa-2.1-api
 BuildRequires:    hibernate-core >= 4.3.1-1
 BuildRequires:    geronimo-jta
-BuildRequires:    solr3
 BuildRequires:    junit
 BuildRequires:    tika
+
+%if %{with_infinispan}
 BuildRequires:    infinispan
+%endif
 
 BuildArch:        noarch
 
@@ -68,11 +83,17 @@ This package contains the API documentation for %{name}.
 %pom_disable_module modules
 %pom_disable_module legacy
 
+%if !%{with_infinispan}
+%pom_disable_module infinispan
+%endif
+
 %pom_remove_plugin ":maven-enforcer-plugin"
 
 %pom_remove_dep "org.apache.tika:tika-parsers" engine/pom.xml
 %pom_add_dep "org.apache.tika:tika-core" engine/pom.xml
 
+sed -i "s|luceneVersion>3.6.2</luceneVersion|luceneVersion>3</luceneVersion|" pom.xml
+
 %build
 %mvn_build -f
 
@@ -87,6 +108,10 @@ This package contains the API documentation for %{name}.
 %doc lgpl.txt
 
 %changelog
+* Wed Apr 16 2014 Marek Goldmann <mgoldman at redhat.com> - 4.5.1-1
+- Upstream release 4.5.1.Final
+- Add support for lucene3 compat package in Fedora > 20
+
 * Fri Mar 28 2014 Michael Simacek <msimacek at redhat.com> - 4.5.0-2
 - Use Requires: java-headless rebuild (#1067528)
 
diff --git a/sources b/sources
index e170c50..c204414 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db5ee689fc09a94c27d79b3e6c40091a  hibernate-search-4.5.0.Final-CLEAN.tar.gz
+4d3510d5879f5c378ebde00ef98374ff  hibernate-search-4.5.1.Final-CLEAN.tar.gz