[istack-commons] Fix FTBFS due to F21 XMvn changes (#1106808)

Yaakov Selkowitz yselkowitz at fedoraproject.org
Sun Aug 3 07:37:24 UTC 2014


commit e8f3da34c55f9f7a9e1dfd35e4feb76e414c74de
Author: Yaakov Selkowitz <yselkowi at redhat.com>
Date:   Sun Aug 3 02:36:32 2014 -0500

    Fix FTBFS due to F21 XMvn changes (#1106808)

 istack-commons.spec |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/istack-commons.spec b/istack-commons.spec
index 07bd39a..21afd11 100644
--- a/istack-commons.spec
+++ b/istack-commons.spec
@@ -1,6 +1,6 @@
 Name:           istack-commons
 Version:        2.17
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Common code for some Glassfish projects
 Group:          Development/Libraries
 License:        CDDL and GPLv2 with exceptions
@@ -125,25 +125,10 @@ cp -p soimp/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-soimp.pom
 %add_maven_depmap JPP-%{name}-maven-plugin.pom %{name}-maven-plugin.jar -f maven-plugin
 %add_maven_depmap JPP-%{name}-soimp.pom %{name}-soimp.jar
 
-%files
-%{_mavenpomdir}/JPP-%{name}-runtime.pom
-%{_mavenpomdir}/JPP-%{name}-test.pom
-%{_mavenpomdir}/JPP-%{name}-tools.pom
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavenpomdir}/JPP-%{name}-buildtools.pom
-%{_mavenpomdir}/JPP-%{name}-soimp.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}-buildtools.jar
-%{_javadir}/%{name}-runtime.jar
-%{_javadir}/%{name}-soimp.jar
-%{_javadir}/%{name}-test.jar
-%{_javadir}/%{name}-tools.jar
+%files -f .mfiles
 %doc Licence.txt
 
-%files -n maven-istack-commons-plugin
-%{_javadir}/%{name}-maven-plugin.jar
-%{_mavenpomdir}/JPP-%{name}-maven-plugin.pom
-%{_mavendepmapfragdir}/%{name}-maven-plugin
+%files -n maven-istack-commons-plugin -f .mfiles-maven-plugin
 %doc Licence.txt
 
 %files javadoc
@@ -152,6 +137,9 @@ cp -p soimp/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-soimp.pom
 
 
 %changelog
+* Sun Aug 03 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 2.17-5
+- Fix FTBFS due to F21 XMvn changes (#1106808)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.17-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list