[solr3] Use lucene3 compat package in Fedora 21+
Marek Goldmann
goldmann at fedoraproject.org
Wed Apr 16 14:05:53 UTC 2014
commit e5c73b77fab37a9d36b0db97e58e9791b3ee6f11
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Wed Apr 16 16:05:23 2014 +0200
Use lucene3 compat package in Fedora 21+
solr3.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/solr3.spec b/solr3.spec
index 986e4bd..add406c 100644
--- a/solr3.spec
+++ b/solr3.spec
@@ -1,6 +1,6 @@
Name: solr3
Version: 3.6.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Apache Solr
License: ASL 2.0
Url: http://lucene.apache.org/solr/
@@ -22,13 +22,14 @@ Source10: https://repository.jboss.org/nexus/service/local/repositories/
Source20: solr-contrib.pom
-BuildRequires: lucene
-BuildRequires: lucene-contrib
+BuildRequires: lucene3
+BuildRequires: lucene3-contrib
BuildRequires: maven-local
BuildRequires: maven-plugin-build-helper
BuildRequires: woodstox-core
BuildRequires: apache-commons-fileupload
BuildRequires: icu4j
+BuildRequires: jcl-over-slf4j
# tmp, see below
BuildRequires: xmlstarlet
@@ -65,6 +66,8 @@ cp %{SOURCE1} parent/pom.xml
# Gmaven is retired
%pom_remove_plugin ":gmaven-plugin" parent/pom.xml
+# Make it build
+%pom_remove_plugin ":maven-enforcer-plugin" parent/pom.xml
cp %{SOURCE2} pom.xml
@@ -119,6 +122,9 @@ done
%doc LICENSE.txt
%changelog
+* Wed Apr 16 2014 Marek Goldmann <mgoldman at redhat.com> - 3.6.2-6
+- Use lucene3 compat package in Fedora 21+
+
* Thu Oct 17 2013 Marek Goldmann <mgoldman at redhat.com> - 3.6.2-5
- Added missing question mark to dist tag
- Removing unnecessary files from tarball at the creation time
More information about the scm-commits
mailing list