From 8f1377a8b062f0d85b3b77ffc89987ce2281b9e3cd94ea866ce8565c0f1b1235 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 8 Oct 2018 06:54:00 +0000 Subject: [PATCH] Accepting request 640443 from home:jengelh:branches:Java:packages - Replace old $RPM_* shell vars by macros. OBS-URL: https://build.opensuse.org/request/show/640443 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javassist?expand=0&rev=21 --- javassist.changes | 5 +++++ javassist.spec | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/javassist.changes b/javassist.changes index 04efa32..126e1f3 100644 --- a/javassist.changes +++ b/javassist.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 7 16:51:45 UTC 2018 - Jan Engelhardt + +- Replace old $RPM_* shell vars by macros. + ------------------------------------------------------------------- Fri Oct 5 13:19:12 UTC 2018 - pmonrealgonzalez@suse.com diff --git a/javassist.spec b/javassist.spec index dc5ffc1..c3745ed 100644 --- a/javassist.spec +++ b/javassist.spec @@ -14,7 +14,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -86,25 +86,25 @@ ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 dist %install # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} +mkdir -p %{buildroot}/%{_javadir} cp -p %{name}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %{buildroot}/%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}/%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # demo -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} -cp -pr sample/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} +mkdir -p %{buildroot}/%{_datadir}/%{name}-%{version} +cp -pr sample/* %{buildroot}/%{_datadir}/%{name}-%{version} # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}/%{_javadocdir}/%{name} +cp -pr html/* %{buildroot}/%{_javadocdir}/%{name} -%fdupes -s $RPM_BUILD_ROOT/%{_javadocdir}/%{name}/jquery/ +%fdupes -s %{buildroot}/%{_javadocdir}/%{name}/jquery/ # manual -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/tutorial -cp -pr tutorial/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/tutorial -cp -p License.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}/tutorial +cp -pr tutorial/* %{buildroot}/%{_docdir}/%{name}-%{version}/tutorial +cp -p License.html %{buildroot}/%{_docdir}/%{name}-%{version} %files %defattr(0644,root,root,0755)