[smooks] Fix hsqldb resolution problem

[Gerard Ryan]

commit 157c3adbc132dfd68830bb3b05f4192ad2718c3a
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Mon Aug 5 22:26:08 2013 +0100

    Fix hsqldb resolution problem

 smooks-f20-hsqldb.patch |   24 ++++++++++++++++++++++++
 smooks.spec             |   26 +++++++++++++++++++++++---
 2 files changed, 47 insertions(+), 3 deletions(-)
---
diff --git a/smooks-f20-hsqldb.patch b/smooks-f20-hsqldb.patch
new file mode 100644
index 0000000..a58796f
--- /dev/null
+++ b/smooks-f20-hsqldb.patch
@@ -0,0 +1,24 @@
+--- commons/src/main/java/org/milyn/util/HsqlServer.java.orig	2013-08-05 21:54:57.565088487 +0100
++++ commons/src/main/java/org/milyn/util/HsqlServer.java	2013-08-05 21:56:12.280728738 +0100
+@@ -2,9 +2,9 @@
+ 
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+-import org.hsqldb.Server;
+-import org.hsqldb.ServerConstants;
+-import org.hsqldb.jdbcDriver;
++import org.hsqldb.server.Server;
++import org.hsqldb.server.ServerConstants;
++import org.hsqldb.jdbc.JDBCDriver;
+ import org.milyn.io.StreamUtils;
+ 
+ import java.io.IOException;
+@@ -60,7 +60,7 @@
+ 
+         startGate.await();
+ 
+-        DriverManager.registerDriver(new jdbcDriver());
++        DriverManager.registerDriver(new JDBCDriver());
+         connection = DriverManager.getConnection(url, username, password);
+     }
+ 
diff --git a/smooks.spec b/smooks.spec
index 63f7aa5..f2ba2ac 100644
--- a/smooks.spec
+++ b/smooks.spec
@@ -3,7 +3,7 @@
 
 Name:           smooks
 Version:        1.5.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Smooks Framework
 
 Group:          Development/Libraries
@@ -13,12 +13,14 @@ Source0:        https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{v
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 
 Patch0:         %{name}-non-utf8-char.patch
+
+# Compensate for newer hsqldb
+Patch1:         %{name}-f20-hsqldb.patch
 BuildArch:      noarch
 
 BuildRequires: maven-local
 BuildRequires: mvn(jaxen:jaxen)
 BuildRequires: mvn(org.mvel:mvel2)
-BuildRequires: mvn(hsqldb:hsqldb:1)
 BuildRequires: mvn(org.yaml:snakeyaml)
 BuildRequires: mvn(javassist:javassist)
 BuildRequires: mvn(com.wutka:dtdparser)
@@ -36,6 +38,12 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
 BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
 BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-plugin)
 
+%if 0%{?fedora} >= 20
+BuildRequires: mvn(org.hsqldb:hsqldb)
+%else
+BuildRequires: mvn(hsqldb:hsqldb:1)
+%endif
+
 %description
 Smooks is an extensible framework for building applications for
 processing XML and non XML data (CSV, EDI, Java etc) using Java.
@@ -183,7 +191,12 @@ find -name '*.class' -delete
 %pom_add_dep com.wutka:dtdparser smooks-core
 
 %pom_remove_dep hsqldb:hsqldb commons
-%pom_add_dep hsqldb:hsqldb:1 commons
+%if 0%{?fedora} >= 20
+%pom_add_dep org.hsqldb:hsqldb commons
+%else
+%pom_add_dep hsqldb:hsqldb commons
+%endif
+
 
 %pom_remove_dep org.codehaus.jackson:jackson-core-lgpl smooks-cartridges/json
 %pom_add_dep org.codehaus.jackson:jackson-core-asl smooks-cartridges/json
@@ -193,6 +206,10 @@ rm -rf commons/src/main/java/org/milyn/annotation/
 
 %patch0
 
+%if 0%{?fedora} >= 20
+%patch1
+%endif
+
 %build
 # We don't have mockobjects, so can't run tests
 %mvn_build -s --skip-tests
@@ -223,6 +240,9 @@ rm -rf commons/src/main/java/org/milyn/annotation/
 %files -n milyn-edisax-parser -f .mfiles-milyn-edisax-parser
 
 %changelog
+* Sun Aug 4 2013 Gerard Ryan <galileo at fedoraproject.org> - 1.5.1-6
+- Fix hsqldb resolution problem
+
 * Wed Jul 31 2013 Gerard Ryan <galileo at fedoraproject.org> - 1.5.1-5
 - Add missing changelog entry