From 37fe95796cc55f2af8290bf78c32226b2ac09fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 12 Nov 2016 06:51:35 -0500 Subject: [PATCH] Make the spec file a tiny bit shorter --- pypy3.spec | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pypy3.spec b/pypy3.spec index 0245be9..b6e6d0b 100644 --- a/pypy3.spec +++ b/pypy3.spec @@ -260,7 +260,6 @@ CPU architecture. %package libs -Group: Development/Languages Summary: Run-time libraries used by PyPy implementations of Python 3 # We supply an emacs mode for the JIT viewer. @@ -274,7 +273,6 @@ Libraries required by the various PyPy implementations of Python 3. %package devel -Group: Development/Languages Summary: Development tools for working with PyPy3 Requires: pypy3%{?_isa} = %{version}-%{release} @@ -284,7 +282,6 @@ Header files for building C extension modules against PyPy3 %if 0%{with_stackless} %package stackless -Group: Development/Languages Summary: Stackless Python interpreter built using PyPy3 Requires: pypy3-libs%{?_isa} = %{version}-%{release} %description stackless @@ -516,8 +513,8 @@ find \ mkdir -p %{buildroot}/%{pypyprefix}/site-packages -ln -s %{pypyprefix}/bin/pypy3 %{buildroot}/%{_bindir}/pypy3 ln -s %{pypyprefix}/bin/pypy3.3 %{buildroot}/%{_bindir}/pypy3.3 +ln -s pypy3.3 %{buildroot}/%{_bindir}/pypy3 # pypy uses .pyc files by default (--objspace-usepycfiles), but has a slightly # different bytecode format to CPython. It doesn't use .pyo files: the -O flag @@ -648,19 +645,17 @@ find \ # Install the JIT trace mode for Emacs: %if %{with_emacs} -mkdir -p %{buildroot}/%{_emacs_sitelispdir} -cp -a rpython/jit/tool/pypytrace-mode.el %{buildroot}/%{_emacs_sitelispdir}/pypy3trace-mode.el -cp -a rpython/jit/tool/pypytrace-mode.elc %{buildroot}/%{_emacs_sitelispdir}/pypy3trace-mode.elc +install -m0644 -p -D -t %{buildroot}/%{_emacs_sitelispdir} \ + rpython/jit/tool/pypytrace-mode.{el,elc} %endif # Install macros for rpm: -mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d -install -m 644 %{SOURCE2} %{buildroot}/%{_rpmconfigdir}/macros.d +install -m0644 -p -D -t %{buildroot}/%{_rpmconfigdir}/macros.d %{SOURCE2} # Remove files we don't want: -rm -f %{buildroot}%{_libdir}//pypy3-5.2.0.tar.bz2 -rm -f %{buildroot}%{pypyprefix}/LICENSE -rm -f %{buildroot}%{pypyprefix}/README.rst +rm -f %{buildroot}%{_libdir}/pypy3-5.2.0.tar.bz2 \ + %{buildroot}%{pypyprefix}/LICENSE \ + %{buildroot}%{pypyprefix}/README.rst # wtf? This is probably masking some bigger problem, but let's do this for now mv -v lib-python/3/test/regrtest.py-new lib-python/3/test/regrtest.py || :