commit 45fd7997ef8582271cf06f7403a505b1daff2a8f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Apr 1 20:12:19 2014 +0200
Deprecate %_mavendepmapdir and %_mavendepmapfragdir
These directories will be replaced my new metadata directory in XMvn
2.0.0. The new directory is not supposed to be used by packager
directly, so it doesn't need a macro.
TODO | 6 ++++++
configure | 4 ++--
install | 4 ++--
macros.d/macros.jpackage | 1 +
4 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/TODO b/TODO
index 5c1f83f..b9bac04 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,12 @@
-*- outline -*-
+* TASKS
+
+** Remove deprecated code when it's no longer used
+ git grep -i @''deprecated
+
+
* BUGS
** Add testcase for pom properties with whitespace
diff --git a/configure b/configure
index 6ee66d8..fcd1fd8 100755
--- a/configure
+++ b/configure
@@ -55,11 +55,11 @@ jvmjardir
jvmlibdir
jvmprivdir
jvmsysconfdir
-mavendepmapdir
-mavendepmapfragdir
mavenpomdir
"
+vars="$vars mavendepmapdir mavendepmapfragdir" # @Deprecated
+
vars_re=$(echo $vars | sed 's/ /\\|/g')
eval $(for _; do echo "$_"; done |
diff --git a/install b/install
index 745038e..943ed6f 100755
--- a/install
+++ b/install
@@ -92,8 +92,8 @@ dir "${jnidir}"
dir "${jnidir}-ext"
dir "${javadocdir}"
dir "${mavenpomdir}"
-dir "${mavendepmapdir}"
-dir "${mavendepmapfragdir}"
+dir "${mavendepmapdir}" # @Deprecated
+dir "${mavendepmapfragdir}" # @Deprecated
dir "${rpmconfigdir}/fileattrs"
diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
index d325129..332f524 100644
--- a/macros.d/macros.jpackage
+++ b/macros.d/macros.jpackage
@@ -104,6 +104,7 @@
%_ivyxmldir %{_datadir}/ivy-xmls
#
+# @Deprecated
# Directory for maven depmaps
#
%_mavendepmapdir %{_sysconfdir}/maven
Show replies by date