commit 656f78e4a1e54aadef05590aa270724506ba3469
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Nov 2 23:21:01 2015 +0100
Drop deprecated directories
Remove deprecated %_mavendepmapdir and %_mavendepmapfragdir RPM macros
and stop owning directories they used to expand to.
configure | 2 --
install | 2 --
macros.d/macros.jpackage | 13 -------------
3 files changed, 0 insertions(+), 17 deletions(-)
---
diff --git a/configure b/configure
index da2fd40..0fa9781 100755
--- a/configure
+++ b/configure
@@ -62,8 +62,6 @@ pyinterpreter
abrtlibdir
"
-vars="$vars mavendepmapdir mavendepmapfragdir" # @Deprecated
-
vars_re=$(echo $vars | sed 's/ /\\|/g')
eval $(for _; do echo "$_"; done |
diff --git a/install b/install
index fe30729..a2e0b3d 100755
--- a/install
+++ b/install
@@ -92,8 +92,6 @@ dir "${jnidir}"
dir "${jnidir}-ext"
dir "${javadocdir}"
dir "${mavenpomdir}"
-dir "${mavendepmapdir}" # @Deprecated
-dir "${mavendepmapfragdir}" # @Deprecated
dir "${datadir}/maven-metadata"
dir "${rpmconfigdir}"
dir "${rpmconfigdir}/macros.d"
diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
index 62d2dc1..6b6646c 100644
--- a/macros.d/macros.jpackage
+++ b/macros.d/macros.jpackage
@@ -105,19 +105,6 @@
#
-# @Deprecated
-# Directory for Maven depmaps
-#
-%_mavendepmapdir %{_sysconfdir}/maven
-
-#
-# @Deprecated
-# Directory for Maven depmaps
-#
-%_mavendepmapfragdir %{_datadir}/maven-fragments
-
-
-#
# Current default JVM home.
#
%java_home %(. %{_javadir}-utils/java-functions; set_jvm; echo $JAVA_HOME)
Show replies by date