[mybatis] rebuilt with mybatis-parent
gil
gil at fedoraproject.org
Thu May 23 07:40:26 UTC 2013
commit 5634f90b73e4b3e0ac78b2fbb52ce377993860a7
Author: gil <puntogil at libero.it>
Date: Thu May 23 09:40:14 2013 +0200
rebuilt with mybatis-parent
mybatis.spec | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/mybatis.spec b/mybatis.spec
index cbc91ba..c886898 100644
--- a/mybatis.spec
+++ b/mybatis.spec
@@ -1,6 +1,6 @@
Name: mybatis
Version: 3.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: SQL Mapping Framework for Java
Group: Development/Libraries
License: ASL 2.0
@@ -14,8 +14,7 @@ Source0: https://github.com/mybatis/mybatis-3/archive/%{name}-%{version}.t
Patch0: %{name}-%{version}-commons-ognl.patch
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
+BuildRequires: mybatis-parent
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-ognl
@@ -30,6 +29,7 @@ BuildRequires: maven-enforcer-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-plugin-bundle
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
@@ -39,14 +39,6 @@ BuildRequires: maven-surefire-provider-junit4
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)
@@ -71,7 +63,6 @@ Requires: log4j
Requires: slf4j
Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -97,7 +88,6 @@ and continued here.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -106,11 +96,6 @@ This package contains javadoc for %{name}.
%setup -q -n %{name}-3-%{name}-%{version}
%patch0 -p1
-%if %{?fedora} > 18
-%pom_remove_parent
-%pom_xpath_inject "pom:project" "
-<groupId>org.mybatis</groupId>"
-%endif
%pom_remove_plugin :maven-pdf-plugin
%pom_remove_plugin :jarjar-maven-plugin
@@ -164,6 +149,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE NOTICE
%changelog
+* Sat May 11 2013 gil cattaneo <puntogil at libero.it> 3.2.2-3
+- rebuilt with mybatis-parent
+
* Sun Apr 21 2013 gil cattaneo <puntogil at libero.it> 3.2.2-2
- rebuilt with mybatis-parent
- run test suite with hsqldb 1.x
More information about the scm-commits
mailing list