[apache-rat] Split up depmap fragments (bug 973242)

Orion Poplawski orion at fedoraproject.org
Tue Jun 11 16:29:43 UTC 2013


commit 60f8f67afe6403ed92cd73a4fc5cb15a6c1d7d36
Author: Orion Poplawski <orion at nwra.com>
Date:   Tue Jun 11 10:29:36 2013 -0600

    Split up depmap fragments (bug 973242)

 apache-rat.spec |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/apache-rat.spec b/apache-rat.spec
index c589f92..5b3bd4b 100644
--- a/apache-rat.spec
+++ b/apache-rat.spec
@@ -3,7 +3,7 @@
 
 Name:           apache-rat
 Version:        0.8
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Apache Release Audit Tool (RAT)
 
 Group:          Development/Libraries
@@ -121,13 +121,14 @@ cp -p pom.xml \
 %add_maven_depmap JPP.%{name}-%{name}.pom
 
 #Components
-for jarname in %{name}{-core,-plugin,-tasks}
+for comp in core plugin tasks
 do
+  jarname=%{name}-${comp}
   jarfile=$jarname/target/${jarname}-%{version}.jar
   cp -p $jarfile $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname}.jar
   cp -p ${jarname}/pom.xml \
     $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-${jarname}.pom
-  %add_maven_depmap JPP.%{name}-${jarname}.pom %{name}/${jarname}.jar
+  %add_maven_depmap JPP.%{name}-${jarname}.pom %{name}/${jarname}.jar -f ${comp}
 done
 
 #Wrapper script
@@ -146,24 +147,27 @@ cp -rp target/site/apidocs \
 %files
 %doc DISCLAIMER.txt LICENSE NOTICE README.txt RELEASE_NOTES.txt
 %{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%{_mavendepmapfragdir}/*
+%{_mavendepmapfragdir}/%{name}
 %dir %{_javadir}/%{name}
 
 %files core
 %doc LICENSE NOTICE
 %{_mavenpomdir}/JPP.%{name}-%{name}-core.pom
+%{_mavendepmapfragdir}/%{name}-core
 %{_bindir}/%{name}
 %{_javadir}/%{name}/%{name}-core.jar
 
 %files plugin
 %doc LICENSE NOTICE
 %{_mavenpomdir}/JPP.%{name}-%{name}-plugin.pom
+%{_mavendepmapfragdir}/%{name}-plugin
 %{_javadir}/%{name}/%{name}-plugin.jar
 
 %files tasks
 %doc LICENSE NOTICE
 %{_sysconfdir}/ant.d/%{name}
 %{_mavenpomdir}/JPP.%{name}-%{name}-tasks.pom
+%{_mavendepmapfragdir}/%{name}-tasks
 %{_javadir}/%{name}/%{name}-tasks.jar
 
 %files javadoc
@@ -172,6 +176,9 @@ cp -rp target/site/apidocs \
 
 
 %changelog
+* Tue Jun 11 2013 Orion Poplawski <orion at cora.nwra.com> 0.8-10
+- Split up depmap fragments (bug 973242)
+
 * Tue Feb 26 2013 Orion Poplawski <orion at cora.nwra.com> 0.8-9
 - Drop BR on maven-doxia and maven-doxia-sitetools (bug #915606)
 


More information about the scm-commits mailing list