[pdfbox: 3/3] Drop lucene sub-package for now, not compatible with lucene 3.6

[Orion Poplawski]

commit b6078700c3d1c9ae28147287f6cdf7cec44734a3
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Sep 24 11:50:48 2012 -0600

    Drop lucene sub-package for now, not compatible with lucene 3.6

 pdfbox-lucene.patch |   13 +++++++++++++
 pdfbox.spec         |   20 ++++++++++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)
---
diff --git a/pdfbox-lucene.patch b/pdfbox-lucene.patch
new file mode 100644
index 0000000..07edb90
--- /dev/null
+++ b/pdfbox-lucene.patch
@@ -0,0 +1,13 @@
+diff -up pdfbox-1.7.0/pom.xml.lucene pdfbox-1.7.0/pom.xml
+--- pdfbox-1.7.0/pom.xml.lucene	2012-05-25 19:14:18.000000000 -0600
++++ pdfbox-1.7.0/pom.xml	2012-09-24 11:47:02.048660998 -0600
+@@ -51,7 +51,8 @@
+     <module>pdfbox</module>
+     <!-- disabled due to some unfinished refactoring-->
+     <!-- module>preflight</module -->
+-    <module>lucene</module>
++    <!-- Not compatible with lucene 3.6 -->
++    <!-- <module>lucene</module> -->
+     <module>ant</module>
+     <module>war</module>
+     <module>app</module>
diff --git a/pdfbox.spec b/pdfbox.spec
index d8a05e4..e4b3acb 100644
--- a/pdfbox.spec
+++ b/pdfbox.spec
@@ -1,6 +1,6 @@
 Name:           pdfbox
 Version:        1.7.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java library for working with PDF documents
 
 Group:          Development/Libraries
@@ -56,11 +56,6 @@ Requires:       fontbox
 Requires:       icu4j
 Requires:       apache-commons-logging
 Requires:       jempbox
-%if 0%{?fedora} >= 18
-Requires:       lucene
-%else
-Requires:       lucene-demo >= 2.4.1
-%endif
 
 Obsoletes:      %{name}-app <= 1.6.0-4
 Provides:       %{name}-app = %{version}-%{release}
@@ -127,14 +122,21 @@ JempBox is an open source Java library that implements Adobe's XMP(TM)
 specification. JempBox is a subproject of Apache PDFBox.
 
 
+# Not compatible with lucene 3.6
+%if 0%{?fedora} < 18
 %package lucene
 Summary:        Apache PDFBox for Lucene
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora} >= 18
+Requires:       lucene
+%else
 Requires:       lucene-demo >= 2.4.1
+%endif
 
 %description lucene
 %{summary}.
+%endif
 
 
 %prep
@@ -220,13 +222,19 @@ cp -p parent/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-pdfbox-parent.pom
 %{_javadir}/jempbox.jar
 %{_mavenpomdir}/JPP-jempbox.pom
 
+# Not compatible with lucene 3.6
+%if 0%{?fedora} < 18
 %files lucene
 %doc LICENSE.txt
 %{_javadir}/%{name}-lucene.jar
 %{_mavenpomdir}/JPP-%{name}-lucene.pom
+%endif
 
 
 %changelog
+* Mon Sep 24 2012 Orion Poplawski <orion at cora.nwra.com> - 1.7.0-4
+- Drop lucene sub-package for now, not compatible with lucene 3.6
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild