commit 92a50ba69562d9cb3b6fc406d6aedd791596757b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Apr 21 12:22:24 2015 +0200
Revert "Add support macros for pm_request mock plugin"
This reverts commit 4cd20c1b7b26ffcba80e2929dba8497ea6fbf529.
macros.d/macros.fjava | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/macros.d/macros.fjava b/macros.d/macros.fjava
index 58fc05e..73f51df 100644
--- a/macros.d/macros.fjava
+++ b/macros.d/macros.fjava
@@ -31,12 +31,6 @@
# Mikolaj Izdebski <mizdebsk(a)redhat.com>
-# Support code for pm_request mock plugin
-%{lua: if posix.access(posix.getenv("PM_REQUEST_SOCKET")) then
- rpm.define("_javapackages_xmvn_env XMVN_REQUEST_ARTIFACT_CMD='%{pyinterpreter}
%{javadir}-utils/mvn_build.py'")
-end}
-
-
# %mvn_package - assign Maven artifact(s) to a subpackage
#
# Usage: %mvn_package [gId]:[aId[:ver]] <subpackage name>
@@ -125,7 +119,7 @@ end}
#
# Usage: %mvn_artifact <pom> [<artifact-file>]
#
-%mvn_artifact %{?_javapackages_xmvn_env} %{pyinterpreter}
%{javadir}-utils/mvn_artifact.py
+%mvn_artifact %{pyinterpreter} %{javadir}-utils/mvn_artifact.py
# %mvn_build - build Maven project
@@ -137,7 +131,7 @@ end}
#
# For summary of accepted options execute `mvn-build --help` command.
#
-%mvn_build %{?_javapackages_xmvn_env} %{pyinterpreter} %{javadir}-utils/mvn_build.py
%{?xmvn_bootstrap: -b} %{?_without_javadoc: -j $(> .mfiles-javadoc)}%{?_without_tests:
-f}
+%mvn_build %{pyinterpreter} %{javadir}-utils/mvn_build.py %{?xmvn_bootstrap: -b}
%{?_without_javadoc: -j $(> .mfiles-javadoc)}%{?_without_tests: -f}
# %mvn_install - install Maven project
@@ -148,7 +142,7 @@ end}
# buildroot. It is intended to be placed in %install section of spec file.
#
%mvn_install(J:X) \
-%{?_javapackages_xmvn_env} xmvn-install %{?-X} -R .xmvn-reactor -n
%{?scl:%{pkg_name}}%{!?scl:%{name}} -d "%{buildroot}" \
+xmvn-install %{?-X} -R .xmvn-reactor -n %{?scl:%{pkg_name}}%{!?scl:%{name}} -d
"%{buildroot}" \
%{-J*:jdir="%{-J*}"}%{!-J*:jdir=target/site/apidocs; [ -d .xmvn/apidocs ]
&& jdir=.xmvn/apidocs} \
if [ -d "${jdir}" ]; then \
install -dm755 %{buildroot}%{_javadocdir}/%{?scl:%{pkg_name}}%{!?scl:%{name}} \
@@ -193,7 +187,7 @@ for _dir in %{_jnidir} %{_javadir}; do \
_jpath="$_jbase/$_jarpart" \
fi \
done \
-%{?_javapackages_xmvn_env} %{pyinterpreter} %{javadir}-utils/maven_depmap.py %{-a}
%{-v*:-r %{-v*}} \\\
+%{pyinterpreter} %{javadir}-utils/maven_depmap.py %{-a} %{-v*:-r %{-v*}} \\\
-n "%{?scl}" \\\
--pom-base %{buildroot}%{_mavenpomdir} \\\
--jar-base "$_jbase" \\\
Show replies by date