[jnr-constants] Fix FTBFS.

Alexander Kurtakov akurtakov at fedoraproject.org
Thu Jun 12 12:58:53 UTC 2014


commit e76fc7eaf86ecd0fa38ede02ae00527c3d9092fc
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Jun 12 15:58:43 2014 +0300

    Fix FTBFS.

 jnr-constants.spec |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/jnr-constants.spec b/jnr-constants.spec
index 40ec953..8724014 100644
--- a/jnr-constants.spec
+++ b/jnr-constants.spec
@@ -3,7 +3,7 @@
 
 Name:           jnr-constants
 Version:        0.8.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Java Native Runtime constants 
 Group:          Development/Libraries
 License:        ASL 2.0
@@ -19,7 +19,7 @@ BuildRequires:  maven-install-plugin
 BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-surefire-provider-junit4
+BuildRequires:  maven-surefire-provider-junit
 
 Requires:       jpackage-utils
 
@@ -40,7 +40,7 @@ find ./ -name '*.jar' -delete
 find ./ -name '*.class' -delete
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
@@ -57,10 +57,9 @@ install -pm 644 pom.xml  \
 
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 
-%files
+%files -f .mfiles
 %doc LICENSE
 %{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 %{_javadir}/%{name}.jar
 %{_javadir}/constantine.jar
 
@@ -69,6 +68,9 @@ install -pm 644 pom.xml  \
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jun 12 2014 Alexander Kurtakov <akurtako at redhat.com> 0.8.4-6
+- Fix FTBFS.
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -116,4 +118,3 @@ install -pm 644 pom.xml  \
 
 * Fri Nov 28 2008 Conrad Meyer <konrad at tylerc.org> - 0.1-1
 - Initial package (needed for jruby 1.1.5).
-


More information about the scm-commits mailing list