From 4cdf1241fa5caee0a080a3cdc3fd2e0355b9ce25 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 1 Mar 2016 08:54:59 +0100 Subject: [PATCH] fix FTBFS rhbz#1307647 --- jboss-logging.spec | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/jboss-logging.spec b/jboss-logging.spec index 4752602..d458f24 100644 --- a/jboss-logging.spec +++ b/jboss-logging.spec @@ -3,7 +3,7 @@ Name: jboss-logging Version: 3.1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The JBoss Logging Framework License: ASL 2.0 URL: https://github.com/jboss-logging/jboss-logging @@ -13,27 +13,25 @@ Patch0: 0001-SLF4j-1.7-upgrade.patch BuildArch: noarch +BuildRequires: git +BuildRequires: graphviz BuildRequires: maven-local -BuildRequires: maven-compiler-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-release-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-enforcer-plugin -BuildRequires: jboss-logmanager -BuildRequires: slf4j -BuildRequires: log4j -BuildRequires: apiviz -BuildRequires: jboss-parent -BuildRequires: maven-surefire-provider-junit +BuildRequires: mvn(log4j:log4j:12) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin) +BuildRequires: mvn(org.jboss:jboss-parent:pom:) +BuildRequires: mvn(org.jboss.apiviz:apiviz) +BuildRequires: mvn(org.jboss.logmanager:jboss-logmanager) +BuildRequires: mvn(org.slf4j:slf4j-api) +# Missing apiviz dep ... +BuildRequires: mvn(jdepend:jdepend) %description This package contains the JBoss Logging Framework. %package javadoc -Summary: Javadocs for %{name} +Summary: Javadoc for %{name} %description javadoc This package contains the API documentation for %{name}. @@ -43,6 +41,10 @@ This package contains the API documentation for %{name}. %patch0 -p1 +%pom_change_dep log4j: ::12 +# Unneeded task +%pom_remove_plugin :maven-source-plugin + %build %mvn_build -f @@ -50,12 +52,18 @@ This package contains the API documentation for %{name}. %mvn_install %files -f .mfiles -%doc src/main/resources/META-INF/LICENSE.txt +%license src/main/resources/META-INF/LICENSE.txt %files javadoc -f .mfiles-javadoc -%doc src/main/resources/META-INF/LICENSE.txt +%license src/main/resources/META-INF/LICENSE.txt %changelog +* Sun Feb 14 2016 gil cattaneo 3.1.4-6 +- fix FTBFS rhbz#1307647 +- fix BR list and use BR mvn()-like +- introduce license macro +- fix some rpmlint problem + * Thu Feb 04 2016 Fedora Release Engineering - 3.1.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild