[mybatis] fix build on f20

gil gil at fedoraproject.org
Wed Apr 24 13:18:22 UTC 2013


commit 2f75bf2ca1ab921bc37c4ef4f815b23635108692
Author: gil <puntogil at libero.it>
Date:   Wed Apr 24 15:18:08 2013 +0200

    fix build on f20

 mybatis.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/mybatis.spec b/mybatis.spec
index 49e8e81..48c37eb 100644
--- a/mybatis.spec
+++ b/mybatis.spec
@@ -15,7 +15,7 @@ Patch0:        %{name}-%{version}-commons-ognl.patch
 
 BuildRequires: java-devel
 BuildRequires: jpackage-utils
-BuildRequires: mybatis-parent
+
 
 BuildRequires: apache-commons-logging
 BuildRequires: apache-commons-ognl
@@ -24,23 +24,29 @@ BuildRequires: javassist
 BuildRequires: log4j
 BuildRequires: slf4j
 
-BuildRequires: animal-sniffer
+
 BuildRequires: maven-local
 BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-plugin-cobertura
-BuildRequires: maven-plugin-bundle
 BuildRequires: maven-resources-plugin
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit4
-BuildRequires: mojo-signatures
 
 %if %{?fedora} > 18
 BuildRequires: geronimo-parent-poms
 %endif
 
+%if !%{?fedora} > 18
+# animal-sniffer is currently broken. it uses asm4, but asm3 is loaded
+BuildRequires: animal-sniffer
+BuildRequires: maven-plugin-bundle
+BuildRequires: mojo-signatures
+BuildRequires: mybatis-parent
+%endif
+
 # test deps
 BuildRequires: junit
 BuildRequires: mvn(commons-dbcp:commons-dbcp)


More information about the scm-commits mailing list