[tika] update to 1.5

[gil]

commit 528a51e7d4b228a17c30bc658a759b155e7b7561
Author: gil <puntogil at libero.it>
Date:   Tue Jul 1 18:39:35 2014 +0200

    update to 1.5

 .gitignore |    1 +
 sources    |    2 +-
 tika.spec  |   31 ++++++++++++++++++++++---------
 3 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e05a17f..d03e5d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tika-1.4-src.zip
+/tika-1.5-src.zip
diff --git a/sources b/sources
index 44f515e..6ca9dd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6daa446b1dfb08888169d558263416d7  tika-1.4-src.zip
+48477b2e70e0e62ece09af7ada5037fa  tika-1.5-src.zip
diff --git a/tika.spec b/tika.spec
index 67b54b0..44b0a52 100644
--- a/tika.spec
+++ b/tika.spec
@@ -7,8 +7,8 @@
 %endif
 
 Name:          tika
-Version:       1.4
-Release:       7%{?dist}
+Version:       1.5
+Release:       1%{?dist}
 Summary:       A content analysis toolkit
 License:       ASL 2.0
 Url:           http://tika.apache.org/
@@ -33,6 +33,7 @@ BuildRequires: mvn(org.gagravarr:vorbis-java-tika)
 %if %{without tika_parsers}
 BuildRequires: mvn(com.adobe.xmp:xmpcore)
 BuildRequires: mvn(com.drewnoakes:metadata-extractor:2)
+BuildRequires: mvn(com.uwyn:jhighlight)
 BuildRequires: mvn(org.gagravarr:vorbis-java-core)
 BuildRequires: mvn(com.googlecode.juniversalchardet:juniversalchardet)
 BuildRequires: mvn(commons-codec:commons-codec)
@@ -53,6 +54,11 @@ BuildRequires: mvn(org.bouncycastle:bcprov-jdk16)
 BuildRequires: mvn(org.ccil.cowan.tagsoup:tagsoup)
 BuildRequires: mvn(org.ow2.asm:asm-all)
 BuildRequires: mvn(rome:rome)
+%if %{without tika_app}
+BuildRequires: mvn(com.google.code.gson:gson)
+BuildRequires: mvn(log4j:log4j:1.2.17)
+BuildRequires: mvn(org.slf4j:slf4j-log4j12)
+%endif
 %endif
 
 %if 0
@@ -67,12 +73,6 @@ BuildRequires: mvn(com.googlecode.mp4parser:isoparser:1.0-RC-1)
 BuildRequires: mvn(org.apache.felix:maven-scr-plugin:1.7.4)
 %endif
 
-%if %{without tika_app}
-BuildRequires: mvn(com.google.code.gson:gson)
-BuildRequires: mvn(log4j:log4j:1.2.17)
-BuildRequires: mvn(org.slf4j:slf4j-log4j12)
-%endif
-
 # Test deps
 BuildRequires: mvn(junit:junit)
 BuildRequires: mvn(org.mockito:mockito-core)
@@ -100,12 +100,18 @@ Apache Tika parsers implementation that matches the
 type of the document, once it is known, using
 Mime Type detection.
 
+%package java7
+Summary:       Apache Tika Java-7 Components
+
+%description java7
+Java-7 reliant components, including FileTypeDetector
+implementations.
+
 %package xmp
 Summary:       Apache Tika XMP
 
 %description xmp
 Converts Tika metadata to XMP.
-%endif
 
 %if %{without tika_app}
 %package app
@@ -115,6 +121,7 @@ Requires:      mvn(log4j:log4j:1.2.17)
 %description app
 Apache Tika standalone application.
 %endif
+%endif
 
 %package javadoc
 Summary:       Javadoc for %{name}
@@ -235,6 +242,9 @@ rm -r %{name}-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegr
 %files parsers -f .mfiles-%{name}-parsers
 %doc LICENSE.txt NOTICE.txt
 
+%files java7 -f .mfiles-%{name}-java7
+%doc LICENSE.txt NOTICE.txt
+
 %files xmp -f .mfiles-%{name}-xmp
 %doc LICENSE.txt NOTICE.txt
 
@@ -249,6 +259,9 @@ rm -r %{name}-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegr
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue Jul 01 2014 gil cattaneo <puntogil at libero.it> 1.5-1
+- update to 1.5
+
 * Wed Jun 11 2014 Fabrice Bellet <fabrice at bellet.info> 1.4-7
 - enable app module, RHBZ#1109072