commit 9984e1868075c87a74cfe849166c9a7e7957807e Author: gil puntogil@libero.it Date: Fri Jul 5 21:33:18 2013 +0200
switch to XMvn
mybatis.spec | 84 ++++++++++++++++++--------------------------------------- 1 files changed, 27 insertions(+), 57 deletions(-) --- diff --git a/mybatis.spec b/mybatis.spec index c886898..5570cac 100644 --- a/mybatis.spec +++ b/mybatis.spec @@ -1,68 +1,47 @@ Name: mybatis Version: 3.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: SQL Mapping Framework for Java -Group: Development/Libraries License: ASL 2.0 # http://code.google.com/p/mybatis/ URL: http://www.mybatis.org/ -# git clone git://github.com/mybatis/mybatis-3.git mybatis-3.2.2 -# (cd mybatis-3.2.2/ && git archive --format=tar --prefix=mybatis-3.2.2/ mybatis-3.2.2 | xz > ../mybatis-3.2.2-src-git.tar.xz) Source0: https://github.com/mybatis/mybatis-3/archive/%%7Bname%7D-%%7Bversion%7D.tar.... # thanks to jhernand # replace ognl ognl with apache-commons-ognl Patch0: %{name}-%{version}-commons-ognl.patch
BuildRequires: java-devel -BuildRequires: mybatis-parent - -BuildRequires: apache-commons-logging -BuildRequires: apache-commons-ognl -BuildRequires: cglib -BuildRequires: javassist -BuildRequires: log4j -BuildRequires: slf4j
+BuildRequires: mvn(cglib:cglib) +BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(log4j:log4j) +BuildRequires: mvn(org.apache.commons:commons-ognl) +BuildRequires: mvn(org.javassist:javassist) +BuildRequires: mvn(org.mybatis:mybatis-parent) +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-log4j12)
BuildRequires: maven-local 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 BuildRequires: maven-surefire-provider-junit4
-%if %{?fedora} > 18 -BuildRequires: geronimo-parent-poms -%endif - # test deps -BuildRequires: junit BuildRequires: mvn(commons-dbcp:commons-dbcp) -BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec) +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.derby:derby) -# unavailable -%if 0 -BuildRequires: mvn(org.hsqldb:hsqldb) >= 2.2.9 -%else +BuildRequires: geronimo-parent-poms +BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec) +BuildRequires: mvn(org.apache.velocity:velocity) >= 1.7 +%if %{?fedora} <= 19 BuildRequires: mvn(hsqldb:hsqldb) +%else +BuildRequires: mvn(org.hsqldb:hsqldb) >= 2.2.9 %endif BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(postgresql:postgresql) -BuildRequires: mvn(org.apache.velocity:velocity) >= 1.7 -
-Requires: apache-commons-logging -Requires: apache-commons-ognl -Requires: cglib -Requires: javassist -Requires: log4j -Requires: slf4j - -Requires: java BuildArch: noarch
%description @@ -86,7 +65,6 @@ a team that includes the original creators of the and continued here.
%package javadoc -Group: Documentation Summary: Javadoc for %{name}
%description javadoc @@ -102,7 +80,7 @@ This package contains javadoc for %{name}. %pom_remove_dep javax.transaction:transaction-api %pom_add_dep org.apache.geronimo.specs:geronimo-jta_1.1_spec::test
-# unavalable test deps hsqldb >= 2.2.9 +%if %{?fedora} <= 19 # adapt for hsqldb 1.x %pom_remove_dep org.hsqldb:hsqldb %pom_add_dep hsqldb:hsqldb::test @@ -119,36 +97,28 @@ rm -r src/test/java/org/apache/ibatis/submitted/complex_type/ComplexTypeTest.jav src/test/java/org/apache/ibatis/submitted/multipleiterates/MultipleIteratesTest.java \ src/test/java/org/apache/ibatis/submitted/foreach_map/ForEachMapTest.java \ src/test/java/org/apache/ibatis/submitted/batch_keys/BatchKeysTest.java - +%endif sed -i 's/\r//' LICENSE NOTICE
%build
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 package javadoc:aggregate +%mvn_file :%{name} %{name} +%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install +%mvn_install
-mkdir -p %{buildroot}%{_javadir} -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -%files -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc LICENSE NOTICE
-%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE
%changelog +* Fri Jul 05 2013 gil cattaneo puntogil@libero.it 3.2.2-4 +- switch to XMvn +- minor changes to adapt to current guideline + * Sat May 11 2013 gil cattaneo puntogil@libero.it 3.2.2-3 - rebuilt with mybatis-parent
java-sig-commits@lists.fedoraproject.org