[java-sig-commits] [maven2] Use mfiles to simplify %files sections

[Mikolaj Izdebski]

commit 77e49a52d70c12579808b2adba748481a9b8d2ea
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Sep 10 14:45:36 2013 +0200

    Use mfiles to simplify %files sections

 maven2.spec |   62 +++++++++++++++-------------------------------------------
 1 files changed, 16 insertions(+), 46 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index d2cf25e..c9e0a38 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -253,8 +253,8 @@ for subdir in maven-artifact-manager maven-error-diagnostics \
      pushd $subdir
      install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{main_pkg}/$subdir.jar
      install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{main_pkg}-$subdir.pom
-     %add_maven_depmap JPP.%{main_pkg}-$subdir.pom %{main_pkg}/$subdir.jar -f $subdir
      popd
+     %add_maven_depmap JPP.%{main_pkg}-$subdir.pom %{main_pkg}/$subdir.jar -f $subdir
 done
 
 # these parts are compatibility versions which are available in
@@ -268,8 +268,9 @@ do
      pushd $subdir
      install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{main_pkg}/$subdir.jar
      install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{main_pkg}-$subdir.pom
-     %add_maven_depmap JPP.%{main_pkg}-$subdir.pom %{main_pkg}/$subdir.jar -f $subdir -v "2.0.2,2.0.6,2.0.7,2.0.8"
      popd
+     %add_maven_depmap JPP.%{main_pkg}-$subdir.pom %{main_pkg}/$subdir.jar -f $subdir -v "2.0.2,2.0.6,2.0.7,2.0.8"
+     sed -i "s/\\($subdir\\)\\.\\(jar\\|pom\\)$/\\1-%{version}.\\2/" .mfiles-$subdir
 done
 
 # javadoc
@@ -278,70 +279,38 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 
 
-%files -n maven-artifact
-%{_mavendepmapfragdir}/%{name}-maven-artifact
-%{_javadir}/%{main_pkg}/maven-artifact-2.*.jar
-%{_mavenpomdir}/JPP.%{main_pkg}-maven-artifact-2.*.pom
+%files -n maven-artifact -f .mfiles-maven-artifact
+%doc LICENSE.txt NOTICE.txt
 
-%files -n maven-artifact-manager
+%files -n maven-artifact-manager -f .mfiles-maven-artifact-manager
 %doc LICENSE.txt NOTICE.txt
-%{_mavendepmapfragdir}/%{name}-maven-artifact-manager
-%{_javadir}/%{main_pkg}/maven-artifact-manager.jar
-%{_mavenpomdir}/JPP.%{main_pkg}-maven-artifact-manager.pom
 
-%files -n maven-error-diagnostics
+%files -n maven-error-diagnostics -f .mfiles-maven-error-diagnostics
 %doc LICENSE.txt NOTICE.txt
-%{_mavendepmapfragdir}/%{name}-maven-error-diagnostics
-%{_javadir}/%{main_pkg}/maven-error-diagnostics.jar
-%{_mavenpomdir}/JPP.%{main_pkg}-maven-error-diagnostics.pom
 
-%files -n maven-model
+%files -n maven-model -f .mfiles-maven-model
 %doc LICENSE.txt NOTICE.txt
-%{_mavendepmapfragdir}/%{name}-maven-model
-%{_javadir}/%{main_pkg}/maven-model-*.jar
-%{_mavenpomdir}/JPP.%{main_pkg}-maven-model-*.pom
 
-%files -n maven-monitor
+%files -n maven-monitor -f .mfiles-maven-monitor
 %doc LICENSE.txt NOTICE.txt
-%{_mavendepmapfragdir}/%{name}-maven-monitor
-%{_javadir}/%{main_pkg}/maven-monitor.jar
-%{_mavenpomdir}/JPP.%{main_pkg}-maven-monitor.pom
 
-%files -n maven-plugin-registry
+%files -n maven-plugin-registry -f .mfiles-maven-plugin-registry
 %doc LICENSE.txt NOTICE.txt
-%{_mavendepmapfragdir}/%{name}-maven-plugin-registry
-%{_javadir}/%{main_pkg}/maven-plugin-registry.jar
-%{_mavenpomdir}/JPP.%{main_pkg}-maven-plugin-registry.pom
 
-%files -n maven-profile
+%files -n maven-profile -f .mfiles-maven-profile
 %doc LICENSE.txt NOTICE.txt
-%{_mavendepmapfragdir}/%{name}-maven-profile
-%{_javadir}/%{main_pkg}/maven-profile.jar
-%{_mavenpomdir}/JPP.%{main_pkg}-maven-profile.pom
 
-%files -n maven-project
+%files -n maven-project -f .mfiles-maven-project
 %doc LICENSE.txt NOTICE.txt
-%{_mavendepmapfragdir}/%{name}-maven-project
-%{_javadir}/%{main_pkg}/maven-project.jar
-%{_mavenpomdir}/JPP.%{main_pkg}-maven-project.pom
 
-%files -n maven-settings
+%files -n maven-settings -f .mfiles-maven-settings
 %doc LICENSE.txt NOTICE.txt
-%{_mavendepmapfragdir}/%{name}-maven-settings
-%{_javadir}/%{main_pkg}/maven-settings-*.jar
-%{_mavenpomdir}/JPP.%{main_pkg}-maven-settings-*.pom
 
-%files -n maven-toolchain
+%files -n maven-toolchain -f .mfiles-maven-toolchain
 %doc LICENSE.txt NOTICE.txt
-%{_mavendepmapfragdir}/%{name}-maven-toolchain
-%{_javadir}/%{main_pkg}/maven-toolchain.jar
-%{_mavenpomdir}/JPP.%{main_pkg}-maven-toolchain.pom
 
-%files -n maven-plugin-descriptor
+%files -n maven-plugin-descriptor -f .mfiles-maven-plugin-descriptor
 %doc LICENSE.txt NOTICE.txt
-%{_mavendepmapfragdir}/%{name}-maven-plugin-descriptor
-%{_javadir}/%{main_pkg}/maven-plugin-descriptor.jar
-%{_mavenpomdir}/JPP.%{main_pkg}-maven-plugin-descriptor.pom
 
 %files javadoc
 %doc LICENSE.txt NOTICE.txt
@@ -353,6 +322,7 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 - Remove code related to bootstrapping
 - Remove empty-dep JAR and POM
 - Remove local depmap
+- Use mfiles to simplify %%files sections
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-46
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild