[smooks: 2/6] RHBZ-989266: Fix hsqldb version; add BR's

Gerard Ryan galileo at fedoraproject.org
Thu Aug 1 18:04:02 UTC 2013


commit 3cb55c4dc6aa7b4d0335a56fd3b785be7c256e91
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Tue Jul 30 22:07:03 2013 +0100

    RHBZ-989266: Fix hsqldb version; add BR's

 smooks.spec |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/smooks.spec b/smooks.spec
index bd39391..cbea907 100644
--- a/smooks.spec
+++ b/smooks.spec
@@ -3,7 +3,7 @@
 
 Name:           smooks
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Smooks Framework
 
 Group:          Development/Libraries
@@ -15,10 +15,19 @@ Patch0:         %{name}-non-utf8-char.patch
 BuildArch:      noarch
 
 BuildRequires: maven-local
+BuildRequires: mvn(org.mvel:mvel2)
+BuildRequires: mvn(hsqldb:hsqldb:1)
+BuildRequires: mvn(com.wutka:dtdparser)
+BuildRequires: mvn(javax.transaction:jta)
+BuildRequires: mvn(net.sf.opencsv:opencsv)
+BuildRequires: mvn(javax.xml.bind:jaxb-api)
+BuildRequires: mvn(org.mockito:mockito-all)
 BuildRequires: mvn(commons-lang:commons-lang)
+BuildRequires: mvn(org.freemarker:freemarker)
+BuildRequires: mvn(org.hibernate:hibernate-core)
 BuildRequires: mvn(commons-logging:commons-logging)
-BuildRequires: mvn(org.mockito:mockito-all)
-BuildRequires: mvn(com.wutka:dtdparser)
+BuildRequires: mvn(javax.persistence:persistence-api)
+BuildRequires: mvn(org.codehaus.jackson:jackson-core-asl)
 
 %description
 Smooks is an extensible framework for building applications for
@@ -170,10 +179,12 @@ Summary: Milyn Edisax Parser
 
 %prep
 %setup -qn %{name}-%{commit}
-find -name \*.jar -o -name \*.class -delete
 
-%pom_disable_module testres
+find -name '*.jar' -delete
+find -name '*.class' -delete
+
 %pom_disable_module edi
+%pom_disable_module testres
 %pom_disable_module %{name}-examples
 
 # Needs mvn(org.ow2.bundles:ow2-bundles-externals-opencsv)
@@ -204,6 +215,9 @@ find -name \*.jar -o -name \*.class -delete
 %pom_remove_dep dtdparser:dtdparser smooks-core
 %pom_add_dep com.wutka:dtdparser smooks-core
 
+%pom_remove_dep hsqldb:hsqldb commons
+%pom_add_dep hsqldb:hsqldb:1 commons
+
 %pom_remove_dep org.codehaus.jackson:jackson-core-lgpl smooks-cartridges/json
 %pom_add_dep org.codehaus.jackson:jackson-core-asl smooks-cartridges/json
 
@@ -242,5 +256,8 @@ find -name \*.jar -o -name \*.class -delete
 %files -n milyn-edisax-parser -f .mfiles-milyn-edisax-parser
 
 %changelog
+* Tue Jul 30 2013 Gerard Ryan <galileo at fedoraproject.org> - 1.5.1-2
+- RHBZ-989266: Fix hsqldb version; add BR's
+
 * Sat Jul 27 2013 Gerard Ryan <galileo at fedoraproject.org> - 1.5.1-1
 - Initial package.


More information about the scm-commits mailing list