[diffuse/f18] Redefine the install.py

[Christopher Meng]

commit 23c4a7ef2eb99cc2e380da5c6b218f932cf6dc3b
Author: Christopher Meng <rpm at cicku.me>
Date:   Sat Jun 29 19:50:42 2013 +0800

    Redefine the install.py

 diffuse.spec |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/diffuse.spec b/diffuse.spec
index 55c4c4c..3bc2e9a 100644
--- a/diffuse.spec
+++ b/diffuse.spec
@@ -1,40 +1,41 @@
 Name:             diffuse
 Version:          0.4.7
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          A graphical tool for merging and comparing text files
-
-Group:            Development/Tools
 License:          GPLv2+
 URL:              http://diffuse.sourceforge.net/
 Source0:          http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRequires:    desktop-file-utils scrollkeeper
 BuildRequires:    gettext
-Requires:         python >= 2.4, pygtk2 >= 2.10
+Requires:         python
+Requires:         pygtk2
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 BuildArch:        noarch
 
 %description
-Diffuse is a graphical tool for merging and comparing text files. Diffuse is
-able to compare an arbitrary number of files side-by-side and gives users the
-ability to manually adjust line matching and directly edit files. Diffuse can
-also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,
-Monotone, Subversion, and SVK repositories for comparison and merging.
+Diffuse is a graphical tool for merging and comparing text files. Diffuse is 
+able to compare an arbitrary number of files side-by-side and gives users the 
+ability to manually adjust line-matching and directly edit files. Diffuse can 
+also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, 
+Monotone, RCS, Subversion, and SVK repositories for comparison and merging.
 
 %prep
 %setup -q
-sed -i 's|/usr/local/|/usr/|g' install.py
 
 %build
 
 %install
-%{__python} install.py --destdir=%{buildroot}
-
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+%{__python} install.py --prefix=%{_prefix} \
+    --destdir=%{buildroot} --files-only \
+    --pythonbin="%{_bindir}/python"
 
 %find_lang %{name}
 
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+
 %post
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 update-desktop-database &> /dev/null || :
@@ -45,13 +46,13 @@ update-desktop-database &> /dev/null || :
 
 %files -f %{name}.lang
 %doc AUTHORS ChangeLog COPYING README
+%config(noreplace) %{_sysconfdir}/diffuserc
 %{_bindir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/diffuse.desktop
 %{_datadir}/gnome/help/diffuse/*/diffuse.xml
 %{_datadir}/omf/diffuse/diffuse-*.omf
 %{_datadir}/pixmaps/diffuse.png
-%config(noreplace) %{_sysconfdir}/diffuserc
 %{_mandir}/man*/*
 %{_mandir}/*/man*/*
 %dir %{_datadir}/gnome/help/diffuse
@@ -59,6 +60,9 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/omf/diffuse
 
 %changelog
+* Sat Jun 29 2013 Christopher Meng <rpm at cicku.me> - 0.4.7-2
+- Redefine the install step again.
+
 * Sat May 18 2013 Christopher Meng <rpm at cicku.me> - 0.4.7-1
 - New version.
 - Redefine the install step.