From 12e044b2005fb15a944ea0603ef3101da2fe5b49 Mon Sep 17 00:00:00 2001 From: Benjamin Lefoul Date: May 11 2017 08:04:53 +0000 Subject: Doclint and pom_change_dep problem --- diff --git a/picketbox-xacml.spec b/picketbox-xacml.spec index c336790..5878643 100644 --- a/picketbox-xacml.spec +++ b/picketbox-xacml.spec @@ -4,7 +4,7 @@ Name: picketbox-xacml # Newer release are available here https://github.com/picketbox/security-xacml/tags Version: 2.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JBoss XACML # BSD: most of the code in ./jboss-sunxacml # see ./jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/AbstractPolicy.java as example @@ -13,6 +13,7 @@ URL: http://picketbox.jboss.org/ # svn export http://anonsvn.jboss.org/repos/jbossas/projects/security/security-xacml/tags/2.0.8.Final/ picketbox-xacml-2.0.8.Final # tar cafJ picketbox-xacml-2.0.8.Final.tar.xz picketbox-xacml-2.0.8.Final Source0: %{name}-%{namedversion}.tar.xz +Patch0: xml-apis.patch BuildArch: noarch @@ -36,7 +37,7 @@ This package contains the API documentation for %{name}. %pom_disable_module assembly -%pom_change_dep -r :xml-apis xml-apis: jboss-sunxacml jboss-xacml +%patch0 -p1 # https://issues.jboss.org/browse/SECURITY-949 cp -p jboss-sunxacml/src/main/resources/licenses/JBossORG-EULA.txt . @@ -51,18 +52,21 @@ rm .classpath %build # Disabled tests because OpenDS is needed -%mvn_build -f +%mvn_build -f -- -Dadditionalparam="-Xdoclint:none" %install -%mvn_install +%mvn_install -- -Dadditionalparam="-Xdoclint:none" %files -f .mfiles -%license JBossORG-EULA.txt +%license JBossORG-EULA.txt %files javadoc -f .mfiles-javadoc %license JBossORG-EULA.txt sunxacml-license.txt %changelog +* Thu May 11 2017 Benjamin Lefoul - 2.0.8-3 +- Disabled doclint and used patch instead of pom_change_dep (not in EL7) + * Sat Feb 11 2017 Fedora Release Engineering - 2.0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/xml-apis.patch b/xml-apis.patch new file mode 100644 index 0000000..dec17ab --- /dev/null +++ b/xml-apis.patch @@ -0,0 +1,24 @@ +diff -ur ../picketbox-xacml-2.0.8.Final.orig/jboss-sunxacml/pom.xml ./jboss-sunxacml/pom.xml +--- ../picketbox-xacml-2.0.8.Final.orig/jboss-sunxacml/pom.xml 2012-04-26 15:54:07.000000000 +0200 ++++ ./jboss-sunxacml/pom.xml 2017-05-11 09:59:29.419657164 +0200 +@@ -13,7 +13,7 @@ + JBoss XACML Library + + +- apache-xerces ++ xml-apis + xml-apis + 2.9.1 + +diff -ur ../picketbox-xacml-2.0.8.Final.orig/jboss-xacml/pom.xml ./jboss-xacml/pom.xml +--- ../picketbox-xacml-2.0.8.Final.orig/jboss-xacml/pom.xml 2012-04-26 15:54:07.000000000 +0200 ++++ ./jboss-xacml/pom.xml 2017-05-11 09:59:29.420657149 +0200 +@@ -18,7 +18,7 @@ + ${project.version} + + +- apache-xerces ++ xml-apis + xml-apis + 2.9.1 +