commit e70add03bcdb889e44fa3d141e50e93b1414452d Author: Michal Srb msrb@redhat.com Date: Fri Jun 13 15:34:37 2014 +0200
[maven_depmap] Drop "prefix" option
It looks like it's not needed any longer
java-utils/maven_depmap.py | 4 ---- macros.d/macros.fjava | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-) --- diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py index 9b29e8f..6f9f7d9 100644 --- a/java-utils/maven_depmap.py +++ b/java-utils/maven_depmap.py @@ -213,9 +213,6 @@ if __name__ == "__main__": help='Additional versions to add for each depmap') parser.add_option('-n', '--namespace', type="str", help='Namespace to use for generated fragments', default="") - parser.add_option('-p', '--prefix', type="str", - help='Prefix where artifacts are expected to be installed', default="/") -
parser.set_defaults(append=None)
@@ -223,7 +220,6 @@ if __name__ == "__main__": append_deps = options.append add_versions = options.versions namespace = options.namespace - prefix = options.prefix
if len(args) < 2: parser.error("Incorrect number of arguments") diff --git a/macros.d/macros.fjava b/macros.d/macros.fjava index ed201b6..cfea825 100644 --- a/macros.d/macros.fjava +++ b/macros.d/macros.fjava @@ -66,7 +66,7 @@ for _dir in %{_jnidir} %{_javajnidir} %{_javadir}; do \ fi \ done \ python -m %{javadir}-utils/maven_depmap %{-a} %{-v*:-r %{-v*}} \\ - -p "%{_prefix}" -n "%{?scl}" \\ + -n "%{?scl}" \\ %{buildroot}%{_datadir}/maven-metadata/%{?scl:%{pkg_name}}%{!?scl:%{name}}%{-f*:-%{-f*}}.xml \\ %{buildroot}%{_mavenpomdir}/$_pompart \\ %if %# == 2 \