[hibernate-validator] fix for RHBZ#1106763 (F21FTBFS)

Michal Srb msrb at fedoraproject.org
Mon Feb 16 15:38:13 UTC 2015


commit 606a1b00a283cc437d693bd7786169dabd1a5b0f
Author: gil <puntogil at libero.it>
Date:   Sun Feb 15 06:16:34 2015 +0100

    fix for RHBZ#1106763 (F21FTBFS)

 hibernate-validator.spec |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/hibernate-validator.spec b/hibernate-validator.spec
index 7653c84..1b950aa 100644
--- a/hibernate-validator.spec
+++ b/hibernate-validator.spec
@@ -3,14 +3,13 @@
 %global majorversion 5
 Name:          hibernate-validator
 Version:       5.0.1
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Bean Validation 1.1 (JSR 349) Reference Implementation
 License:       ASL 2.0
 URL:           http://www.hibernate.org/subprojects/validator.html
 Source0:       https://github.com/hibernate/hibernate-validator/archive/%{namedversion}.tar.gz
 # JAXB2 and JDK7 problems see https://hibernate.atlassian.net/browse/HV-528
 Patch0:        %{name}-5.0.1.Final-jaxb.patch
-BuildRequires: java-devel
 
 BuildRequires: cdi-api
 BuildRequires: bean-validation-api
@@ -139,6 +138,11 @@ find . -name "*.jar" -delete
 %pom_disable_module integration
 %pom_disable_module tck-runner
 
+%pom_xpath_inject "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" "
+<excludePackageNames>*.internal.*</excludePackageNames>"
+
+%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" "
+<excludePackageNames>*.internal.*</excludePackageNames>" engine
 
 %build
 %mvn_package ":%{name}-parent" %{name}
@@ -154,29 +158,34 @@ install -m 644 engine/target/hibernate-validator-%{namedversion}-testing.jar \
 %files -f .mfiles-%{name}
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/%{name}-testing.jar
-%doc CONTRIBUTING.md README.md changelog.txt copyright.txt license.txt
+%doc CONTRIBUTING.md README.md changelog.txt
+%license copyright.txt license.txt
 
 %files annotation-processor -f .mfiles-%{name}-annotation-processor
-%doc license.txt
+%license copyright.txt license.txt
 
 %files cdi -f .mfiles-%{name}-cdi
-%doc license.txt
+%license copyright.txt license.txt
 
 %files performance -f .mfiles-%{name}-performance
-%doc license.txt
+%license copyright.txt license.txt
 
 %if 0
 %files integration -f .mfiles-%{name}-integrationtest-as
-%doc license.txt
+%license copyright.txt license.txt
 
 %files tck-runner -f .mfiles-%{name}-tck-runner
-%doc license.txt
+%license copyright.txt license.txt
 %endif
 
 %files javadoc -f .mfiles-javadoc
-%doc license.txt
+%license copyright.txt license.txt
 
 %changelog
+* Sun Feb 15 2015 gil cattaneo <puntogil at libero.it> 5.0.1-4
+- fix for RHBZ#1106763 (F21FTBFS)
+- introduce license macro
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list