[java-sig-commits] [javapackages] Revert "Move macros.fjava to javapackages-local"

commit 692ceb08f69cd57e04a2179d608b44c87f501dca Author: Michael Simacek <msimacek(a)redhat.com&gt; Date: Fri May 15 10:52:21 2015 +0200 Revert "Move macros.fjava to javapackages-local" The move breaks most of the packages that use add_maven_depmap. This reverts commit 166389fe07c87e15104c2ea9c5d75d10b061ac7b. Conflicts: install install | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) --- diff --git a/install b/install index 9b3cdf5..3a3bcf4 100755 --- a/install +++ b/install @@ -128,6 +128,7 @@ inst_data java-utils/pom_editor.py "${javadir}-utils" inst_data java-utils/request-artifact.py "${javadir}-utils" inst_data target/macros.jpackage "${rpmconfigdir}/macros.d" +inst_data target/macros.fjava "${rpmconfigdir}/macros.d" inst_data target/build-classpath.1 "${mandir}/man1" inst_data target/build-jar-repository.1 "${mandir}/man1" @@ -170,8 +171,6 @@ link "${m2home}/configuration.xml" "${m2home}/configuration-21.xml" inst_config etc/javapackages-config.json "${javaconfdir}" exec >files-local -inst_data target/macros.fjava "${rpmconfigdir}/macros.d" - inst_data java-utils/mvn_alias.py "${javadir}-utils" inst_data java-utils/mvn_artifact.py "${javadir}-utils" inst_data java-utils/mvn_compat_version.py "${javadir}-utils"