[ws-jaxme] fix BR list

gil gil at fedoraproject.org
Tue Jun 10 14:08:46 UTC 2014


commit 2b67b8c992b2a895030c7a122ec8230786156624
Author: gil <puntogil at libero.it>
Date:   Tue Jun 10 16:08:36 2014 +0200

    fix BR list

 ws-jaxme.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/ws-jaxme.spec b/ws-jaxme.spec
index efe7597..b6b9caf 100644
--- a/ws-jaxme.spec
+++ b/ws-jaxme.spec
@@ -67,8 +67,8 @@ BuildRequires:  ant-apache-resolver
 BuildRequires:  antlr
 BuildRequires:  apache-commons-codec
 BuildRequires:  junit
-BuildRequires:  hsqldb
-BuildRequires:  log4j
+BuildRequires:  hsqldb1
+BuildRequires:  log4j12
 BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
 BuildRequires:  docbook-style-xsl
@@ -77,8 +77,8 @@ BuildRequires:  zip
 Requires:       antlr
 Requires:       apache-commons-codec
 Requires:       junit
-Requires:       hsqldb
-Requires:       log4j
+Requires:       hsqldb1
+Requires:       log4j12
 Requires:       xalan-j2
 Requires:       xerces-j2
 Requires:       jpackage-utils
@@ -126,8 +126,11 @@ DOCBOOKX_DTD=`%{_bindir}/xmlcatalog %{_datadir}/sgml/docbook/xmlcatalog "-//OASI
 
 sed -i 's/\r//' NOTICE
 
+sed -i "s|log4j.jar|log4j12-1.2.17.jar|" ant/js.xml
+sed -i "s|hsqldb.jar|hsqldb1.jar|" ant/js.xml ant/pm.xml
+
 %build
-export CLASSPATH=$(build-classpath antlr hsqldb commons-codec junit log4j xerces-j2 xalan-j2 xalan-j2-serializer)
+export CLASSPATH=$(build-classpath antlr hsqldb commons-codec junit log4j12-1.2.17 xerces-j2 xalan-j2 xalan-j2-serializer)
 ant all Docs.all \
 -Dbuild.sysclasspath=first \
 -Ddocbook.home=%{_datadir}/sgml/docbook \


More information about the scm-commits mailing list