diff --git a/MavenJPackageDepmap.java b/MavenJPackageDepmap.java index 2567c0c..089bbbb 100644 --- a/MavenJPackageDepmap.java +++ b/MavenJPackageDepmap.java @@ -154,17 +154,21 @@ public class MavenJPackageDepmap { // process fragments in etc File fragmentDir = new File("/etc/maven/fragments"); String flist[] = fragmentDir.list(); - if (flist != null) + if (flist != null) { + java.util.Arrays.sort(flist); for (String fragFilename : flist) processDepmapFile("/etc/maven/fragments/" + fragFilename); + } // process fragments is usr. Once packages are rebuilt, we can skip // fragments in /etc fragmentDir = new File("/usr/share/maven-fragments"); flist = fragmentDir.list(); - if (flist != null) + if (flist != null) { + java.util.Arrays.sort(flist); for (String fragFilename : flist) processDepmapFile("/usr/share/maven-fragments/" + fragFilename); + } String customFileName = System.getProperty("maven.local.depmap.file", null); diff --git a/maven.spec b/maven.spec index d76d204..4c77b05 100644 --- a/maven.spec +++ b/maven.spec @@ -1,7 +1,7 @@ Name: maven Version: 3.0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools @@ -292,7 +292,6 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %files -%defattr(-,root,root,-) %doc LICENSE.txt NOTICE.txt README.txt %attr(0755,root,root) %{_bindir}/mvn3 %attr(0755,root,root) %{_bindir}/mvn-local @@ -314,12 +313,14 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_datadir}/%{name}/repo-metadata.tar.xz %files javadoc -%defattr(-,root,root,-) %doc LICENSE.txt %{_javadocdir}/%{name} %changelog +* Wed Jun 22 2011 Stanislav Ochotnicky - 3.0.3-7 +- Process fragments in alphabetical order + * Tue Jun 21 2011 Stanislav Ochotnicky - 3.0.3-6 - Fix handling of fallback default_poms - Add empty-dep into maven package to not require maven2 version