From fc3d0b1db142c3aa486eae9a24893992a8e6d01b Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 17 May 2012 14:40:16 +0200 Subject: [PATCH] Use %{buildroot} consistently --- apache-commons-discovery.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apache-commons-discovery.spec b/apache-commons-discovery.spec index 9aae1fe..fabcbaa 100644 --- a/apache-commons-discovery.spec +++ b/apache-commons-discovery.spec @@ -50,17 +50,17 @@ mvn-rpmbuild install javadoc:aggregate %install # jar -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar -mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom +mkdir -p %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom %add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} %files %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt