[java-sig-commits] [javapackages] Remove double slashes. Use consistent %{buildroot}
commit a72382753604c1b67a3166426104f1f029a98cec
Author: Mattias Ellert <mattias.ellert(a)fysast.uu.se>
Date: Thu Sep 12 16:17:10 2013 +0200
Remove double slashes. Use consistent %{buildroot}
Signed-off-by: Mikolaj Izdebski <mizdebsk(a)redhat.com>
etc/macros.fjava | 2 +-
etc/macros.jpackage | 8 ++++----
etc/macros.xmvn | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/etc/macros.fjava b/etc/macros.fjava
index c0862af..bdfd624 100644
--- a/etc/macros.fjava
+++ b/etc/macros.fjava
@@ -59,7 +59,7 @@ set -e \
_jarpart="%2" \
%endif \
_filelist=".mfiles%{-f*:-%{-f*}}" \
-install -dm 755 %{buildroot}%{_mavendepmapfragdir}\
+install -dm 755 %{buildroot}%{_mavendepmapfragdir} \
for _dir in %{_jnidir} %{_javajnidir} %{_javadir}; do \
if [ -f %{buildroot}$_dir/$_jarpart ]; then \
_jpath="%{buildroot}$_dir/$_jarpart" \
diff --git a/etc/macros.jpackage b/etc/macros.jpackage
index 6d830c4..c3a1d8f 100644
--- a/etc/macros.jpackage
+++ b/etc/macros.jpackage
@@ -136,7 +136,7 @@
# %{javadir}-ext/foo.jar
# %{javadir}-*/bar.jar
#
-%add_jvm_extension JAVA_LIBDIR=%{buildroot}/%{_javadir} %{_bindir}/jvmjar -l
+%add_jvm_extension JAVA_LIBDIR=%{buildroot}%{_javadir} %{_bindir}/jvmjar -l
#
@@ -152,8 +152,8 @@
# %6 whether to prefer a jre over a sdk when finding a jvm
#
%jpackage_script() \
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}\
-cat > $RPM_BUILD_ROOT%{_bindir}/%5 << EOF \
+install -d -m 755 %{buildroot}%{_bindir} \
+cat > %{buildroot}%{_bindir}/%5 << EOF \
#!/bin/sh\
#\
# %{name} script\
@@ -188,5 +188,5 @@ set_options \\$BASE_OPTIONS\
# Let's start\
run "\\$@"\
EOF\
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/%5\
+chmod 755 %{buildroot}%{_bindir}/%5\
%{nil}
diff --git a/etc/macros.xmvn b/etc/macros.xmvn
index bba3db9..5ec8123 100644
--- a/etc/macros.xmvn
+++ b/etc/macros.xmvn
@@ -144,8 +144,8 @@
xmvn-install %{?-X} -R .xmvn-reactor -n "${RPM_PACKAGE_NAME}" -d
"%{buildroot}" \
jdir="%{-J*:%{-J*}}%{!-J*:target/site/apidocs}" \
if [ -d "${jdir}" ]; then \
- install -dm755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name} \
- cp -pr "${jdir}"/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} \
- echo '/%{_javadocdir}/%{name}' >>.mfiles-javadoc \
+ install -dm755 %{buildroot}%{_javadocdir}/%{name} \
+ cp -pr "${jdir}"/* %{buildroot}%{_javadocdir}/%{name} \
+ echo '%{_javadocdir}/%{name}' >>.mfiles-javadoc \
fi \
%{nil}