commit c55e8a7a1bebc1f3cd804b1d0eec5bb63b920784 Author: gil puntogil@libero.it Date: Fri Jul 5 22:10:21 2013 +0200
switch to XMvn
openid4java.spec | 102 +++++++++++++++++++----------------------------------- 1 files changed, 36 insertions(+), 66 deletions(-) --- diff --git a/openid4java.spec b/openid4java.spec index c8085e4..97460e6 100644 --- a/openid4java.spec +++ b/openid4java.spec @@ -3,9 +3,8 @@
Name: openid4java Version: 0.9.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: This library allows you to OpenID-enable your Java web-app -Group: Development/Libraries License: ASL 2.0 URL: http://code.google.com/p/openid4java/ Source0: http://openid4java.googlecode.com/files/openid4java-%%7Bfullversion%7D.tar.g... @@ -14,54 +13,36 @@ Patch0: %{name}-0.9.6.662-ehcache-core.patch
BuildRequires: java-devel
-BuildRequires: apache-commons-codec -BuildRequires: apache-commons-logging -BuildRequires: atinject -BuildRequires: ehcache-core -BuildRequires: google-guice -BuildRequires: httpcomponents-client -BuildRequires: httpcomponents-core -BuildRequires: log4j -BuildRequires: nekohtml -BuildRequires: springframework -BuildRequires: springframework-beans -BuildRequires: springframework-jdbc -BuildRequires: springframework-tx -BuildRequires: tomcat-jsp-2.2-api -BuildRequires: tomcat-servlet-3.0-api -BuildRequires: xerces-j2 +BuildRequires: mvn(com.google.inject:guice) +BuildRequires: mvn(commons-codec:commons-codec) +BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: mvn(log4j:log4j) +BuildRequires: mvn(net.sf.ehcache:ehcache-core) +BuildRequires: mvn(net.sourceforge.nekohtml:nekohtml) +BuildRequires: mvn(org.apache.httpcomponents:httpclient) +BuildRequires: mvn(org.apache.httpcomponents:httpcore) +BuildRequires: mvn(org.springframework:spring-core) +BuildRequires: mvn(org.springframework:spring-beans) +BuildRequires: mvn(org.springframework:spring-jdbc) +BuildRequires: mvn(org.springframework:spring-tx) +BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) +BuildRequires: mvn(org.apache.tomcat:tomcat-jsp-api) +BuildRequires: mvn(xerces:xercesImpl)
# test deps -BuildRequires: apache-commons-io -BuildRequires: cglib -BuildRequires: hsqldb -BuildRequires: jdom -BuildRequires: junit -BuildRequires: log4j +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(net.sf.cglib:cglib) +BuildRequires: mvn(hsqldb:hsqldb) +BuildRequires: mvn(jdom:jdom) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(log4j:log4j) BuildRequires: xml-commons-apis
BuildRequires: maven-local BuildRequires: maven-antrun-plugin BuildRequires: properties-maven-plugin
-Requires: atinject -Requires: apache-commons-codec -Requires: apache-commons-logging -Requires: ehcache-core -Requires: google-guice -Requires: httpcomponents-client -Requires: httpcomponents-core -Requires: log4j -Requires: nekohtml -Requires: springframework -Requires: springframework-beans -Requires: springframework-jdbc -Requires: springframework-tx -Requires: tomcat-jsp-2.2-api -Requires: tomcat-servlet-3.0-api -Requires: xerces-j2 - -Requires: java BuildArch: noarch
%description @@ -69,7 +50,6 @@ OpenID4Java library offers support for OpenID-enabling a consumer site or implementing an OpenID Provider server.
%package javadoc -Group: Documentation Summary: Javadoc for %{name}
%description javadoc @@ -141,39 +121,29 @@ rm -r test/src/org/openid4java/consumer/EhcacheNonceVerifierTest.java %pom_add_dep net.sf.cglib:cglib::test
%build + +%mvn_file :%{name} %{name} +%mvn_file :%{name} %{name}-nodeps # @ random tests fails # e.g. Failed tests: testNonceCleanup(org.openid4java.consumer.JdbcNonceVerifierTest): expected:<0> but was:<3> -mvn-rpmbuild package javadoc:aggregate - -%install - -mkdir -p %{buildroot}%{_javadir} -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -( - cd %{buildroot}%{_javadir} - ln -sf %{name}.jar %{name}-nodeps.jar -) +%mvn_build
-mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar - -mkdir -p %{buildroot}%{_javadocdir}/%{name} rm -rf target/site/apidocs/javadoc.sh -cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-%files -%{_javadir}/%{name}*.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%install +%mvn_install + +%files -f .mfiles %doc CHANGELOG LICENSE MAINTAINERS README TODO VERSION
-%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc LICENSE
%changelog +* Fri Jul 05 2013 gil cattaneo puntogil@libero.it 0.9.8-2 +- switch to XMvn +- minor changes to adapt to current guideline + * Fri May 31 2013 gil cattaneo puntogil@libero.it 0.9.8-1 - update to 0.9.8.741
java-sig-commits@lists.fedoraproject.org