[dissy] Cleanup.

Christopher Meng cicku at fedoraproject.org
Wed Nov 27 05:06:19 UTC 2013


commit e464663a5e9322d98765d07d5577c74657742870
Author: Christopher Meng <rpm at cicku.me>
Date:   Wed Nov 27 13:05:51 2013 +0800

    Cleanup.

 dissy.spec |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/dissy.spec b/dissy.spec
index 06c6968..486d119 100644
--- a/dissy.spec
+++ b/dissy.spec
@@ -6,12 +6,13 @@ License:        GPLv2
 URL:            http://code.google.com/p/dissy
 Source0:        http://dissy.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:        dissy.desktop
+BuildArch:      noarch
 BuildRequires:  desktop-file-utils
-BuildRequires:  python2-devel python-setuptools
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
 Requires:       binutils
-Requires:       pygtk2
 Requires:       pygobject2
-BuildArch:      noarch
+Requires:       pygtk2
 
 %description
 Dissy is a graphical frontend to the objdump disassembler, it can be used
@@ -21,20 +22,20 @@ for debugging and browsing compiler-generated code.
 %setup -q
 
 %build
-%{__python} setup.py build
+%{__python2} setup.py build
 
 %install
-%{__python} setup.py install -O1 --prefix %{_prefix} --skip-build --root %{buildroot}
+%{__python2} setup.py install -O1 --prefix %{_prefix} --skip-build --root %{buildroot}
 rm -r %{buildroot}%{_docdir}
 
 # Icon file. Upstream doesn't use any
-install -d %{buildroot}%{_datadir}/pixmaps
+install -pd %{buildroot}%{_datadir}/pixmaps
 install -pm644 \
         %{buildroot}%{_datadir}/dissy/gfx/red_arrow_left.png \
         %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 # Desktop menu entry
-install -d %{buildroot}%{_datadir}/applications
+install -pd %{buildroot}%{_datadir}/applications
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:1}
 
 %files
@@ -44,8 +45,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:1}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 %{_mandir}/man1/%{name}.1*
-%{python_sitelib}/%{name}
-%{python_sitelib}/%{name}-%{version}-py2.7.egg-info
+%{python2_sitelib}/%{name}
+%{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info
 
 %changelog
 * Thu Aug 15 2013 Christopher Meng <rpm at cicku.me> - 10-1


More information about the scm-commits mailing list