From 77687314f2fe6fcc3c5ec77d443f2249b42ed14c Mon Sep 17 00:00:00 2001 From: gil Date: Aug 06 2015 09:21:13 +0000 Subject: fix FTBFS RHBZ#1239605 Signed-off-by: Mikolaj Izdebski --- diff --git a/jboss-saaj-1.3-api.spec b/jboss-saaj-1.3-api.spec index 7f384f8..828aa47 100644 --- a/jboss-saaj-1.3-api.spec +++ b/jboss-saaj-1.3-api.spec @@ -1,84 +1,61 @@ %global namedreltag .Final %global namedversion %{version}%{?namedreltag} -Name: jboss-saaj-1.3-api -Version: 1.0.2 -Release: 10%{?dist} -Summary: SOAP with Attachments API for Java 1.3 -Group: Development/Libraries -License: CDDL or GPLv2 with exceptions -URL: http://www.jboss.org +Name: jboss-saaj-1.3-api +Version: 1.0.2 +Release: 11%{?dist} +Summary: SOAP with Attachments API for Java 1.3 +License: CDDL or GPLv2 with exceptions +URL: http://www.jboss.org # git clone git://github.com/jboss/jboss-saaj-api_spec.git jboss-saaj-1.3-api # cd jboss-saaj-1.3-api/ && git archive --format=tar --prefix=jboss-saaj-1.3-api-1.0.2.Final/ jboss-saaj-api_1.3_spec-1.0.2.Final | xz > jboss-saaj-1.3-api-1.0.2.Final.tar.xz -Source0: %{name}-%{namedversion}.tar.xz +Source0: %{name}-%{namedversion}.tar.xz -BuildArch: noarch - -BuildRequires: jpackage-utils -BuildRequires: java-devel +BuildArch: noarch BuildRequires: maven-local -BuildRequires: maven-compiler-plugin -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin - -Requires: jpackage-utils - +BuildRequires: mvn(org.jboss:jboss-parent:pom:) %description The SOAP with Attachments API for Java Version 1.3 classes. - %package javadoc -Summary: Javadocs for %{name} -Group: Documentation -Requires: jpackage-utils - +Summary: Javadoc for %{name} %description javadoc This package contains the API documentation for %{name}. - %prep %setup -q -n %{name}-%{namedversion} +# Unneeded plugin +%pom_remove_plugin :maven-source-plugin + +%mvn_file : %{name} %build -mvn-rpmbuild install javadoc:aggregate +%mvn_build %install - -# Jar files: -install -d -m 755 %{buildroot}%{_javadir} -install -pm 644 target/jboss-saaj-api_1.3_spec-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}.jar - -# POM files: -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom - -# Dependencies map: -%add_maven_depmap JPP-%{name}.pom %{name}.jar - -# Javadoc files: -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - +%mvn_install %files -f .mfiles -%doc LICENSE +%license LICENSE %doc README - -%files javadoc -%{_javadocdir}/%{name} -%doc LICENSE +%files javadoc -f .mfiles-javadoc +%license LICENSE %doc README - %changelog +* Wed Jul 29 2015 gil cattaneo 1.0.2-11 +- fix FTBFS rhbz#1239605 +- fix BR list and use BRs mvn()-like +- minor changes for adapt to current guideline +- introduce license macro +- resolve some rpmlint problem + * Wed Jun 17 2015 Fedora Release Engineering - 1.0.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild