[lucene/f18] Build lucene-contrib in Fedora only.

jerboaa jerboaa at fedoraproject.org
Mon Nov 26 15:00:50 UTC 2012


commit 7b42e9102f669373c1d65f074880c671d0968d80
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Mon Nov 26 15:59:31 2012 +0100

    Build lucene-contrib in Fedora only.

 lucene.spec |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)
---
diff --git a/lucene.spec b/lucene.spec
index f5bf0ab..2f84892 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -31,7 +31,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        3.6.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
@@ -60,11 +60,14 @@ BuildRequires:  unzip
 BuildRequires:  zip
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  apache-commons-compress
-BuildRequires:  icu4j
 BuildRequires:  apache-ivy
 BuildRequires:  lucene
 # for tests
 BuildRequires:  subversion
+# BR for lucene-contrib
+%if 0%{?fedora}
+BuildRequires:  icu4j
+%endif
 
 Provides:       lucene-core = %{epoch}:%{version}-%{release}
 # previously used by eclipse but no longer needed
@@ -88,6 +91,7 @@ Requires:       jpackage-utils
 %description javadoc
 %{summary}.
 
+%if 0%{?fedora}
 %package contrib
 Summary:        Lucene contributed extensions
 Group:          Development/Libraries
@@ -95,6 +99,7 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description contrib
 %{summary}.
+%endif
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -128,8 +133,21 @@ sed -i -e "s|jakarta-regexp|regexp|g" contrib/queries/ivy.xml
 mkdir -p docs
 mkdir -p lib
 export OPT_JAR_LIST="ant/ant-junit junit"
-export CLASSPATH=$(build-classpath jline jtidy regexp commons-digester apache-commons-compress icu4j ivy)
+export CLASSPATH=$(build-classpath jline jtidy regexp commons-digester apache-commons-compress ivy)
+
+
+ant -Divy.settings.file=ivy-conf.xml -Dbuild.sysclasspath=first \
+  -Djavacc.home=%{_bindir}/javacc \
+  -Djavacc.jar=%{_javadir}/javacc.jar \
+  -Djavacc.jar.dir=%{_javadir} \
+  -Djavadoc.link=file://%{_javadocdir}/java \
+  -Dversion=%{version} \
+  -Dfailonjavadocwarning=false \
+  -Dmaven-tasks.uptodate=true \
+  jar-lucene-core docs javadocs-core
 
+%if 0%{?fedora}
+export CLASSPATH=$(build-classpath jline jtidy regexp commons-digester apache-commons-compress icu4j ivy)
 ant -Divy.settings.file=ivy-conf.xml -Dbuild.sysclasspath=first \
   -Djavacc.home=%{_bindir}/javacc \
   -Djavacc.jar=%{_javadir}/javacc.jar \
@@ -138,14 +156,17 @@ ant -Divy.settings.file=ivy-conf.xml -Dbuild.sysclasspath=first \
   -Dversion=%{version} \
   -Dfailonjavadocwarning=false \
   -Dmaven-tasks.uptodate=true \
-  jar-lucene-core jar-test-framework docs javadocs build-contrib
-        
+  jar-test-framework javadocs build-contrib
+%endif
+    
 # add missing OSGi metadata to manifests
 mkdir META-INF
 unzip -o build/core/lucene-core-%{version}.jar META-INF/MANIFEST.MF
 cp %{SOURCE1} META-INF/MANIFEST.MF
 sed -i '/^\r$/d' META-INF/MANIFEST.MF
 zip -u build/core/lucene-core-%{version}.jar META-INF/MANIFEST.MF
+
+%if 0%{?fedora}
 unzip -o build/contrib/analyzers/common/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
 cp %{SOURCE2} META-INF/MANIFEST.MF
 sed -i '/^\r$/d' META-INF/MANIFEST.MF
@@ -153,6 +174,7 @@ zip -u build/contrib/analyzers/common/lucene-analyzers-%{version}.jar META-INF/M
 
 mv build/contrib/analyzers/common build/contrib/analyzers/analyzers
 mv dev-tools/maven/lucene/contrib/analyzers/common dev-tools/maven/lucene/contrib/analyzers/analyzers
+%endif
 
 %install
 
@@ -165,6 +187,7 @@ install -m 0644 dev-tools/maven/lucene/core/pom.xml.template \
 ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core.jar
 %add_maven_depmap JPP-lucene-core.pom %{name}-core.jar
 
+%if 0%{?fedora}
 # contrib jars
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}-contrib
 for c in benchmark demo facet grouping highlighter \
@@ -198,6 +221,7 @@ install -m 0644 dev-tools/maven/lucene/pom.xml.template \
 install -m 0644 dev-tools/maven/pom.xml.template \
        $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-solr-grandparent.pom
 %add_maven_depmap JPP-lucene-solr-grandparent.pom
+%endif
 
 # javadoc
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -215,11 +239,17 @@ cp -pr build/docs/api/* \
 %doc LICENSE.txt
 %{_javadocdir}/%{name}
 
+%if 0%{?fedora}
 %files contrib
 %{_javadir}/%{name}-contrib
 %doc contrib/CHANGES.txt
+%endif
 
 %changelog
+* Mon Nov 26 2012 Severin Gehwolf <sgehwolf at redhat.com> 0:3.6.0-7
+- Only build lucene-contrib for Fedora.
+- This removes BR on icu4j on rhel.
+
 * Fri Nov 23 2012 Severin Gehwolf <sgehwolf at redhat.com> 0:3.6.0-6
 - Fix OSGi medatada. In particular:
 - Missing import javax.management (lucene-core)


More information about the scm-commits mailing list