[diffuse] New version

[Christopher Meng]

commit 8aa56314fff48d23fbe57f6f37387fc6264394ce
Author: Christopher Meng <rpm at cicku.me>
Date:   Sat May 18 10:10:35 2013 +0800

    New version

 .gitignore   |    1 +
 diffuse.spec |   51 ++++++++++++++++++++++-----------------------------
 sources      |    1 +
 3 files changed, 24 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88ac76a..ee2b44f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 diffuse-0.4.0.tar.bz2
 diffuse-0.4.3.tar.bz2
 /diffuse-0.4.5.tar.bz2
+/diffuse-0.4.7.tar.bz2
diff --git a/diffuse.spec b/diffuse.spec
index 3417f87..9a72d1d 100644
--- a/diffuse.spec
+++ b/diffuse.spec
@@ -1,25 +1,23 @@
-Name: diffuse
-Version: 0.4.5
-Release: 4%{?dist}
-Summary: Graphical tool for comparing and merging text files
-
-Group: Development/Tools
-License: GPLv2+
-URL: http://%{name}.sourceforge.net/
-Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-
-BuildRequires: desktop-file-utils, scrollkeeper
-Requires: python >= 2.4, pygtk2 >= 2.10
-Requires(post): scrollkeeper
+Name:             diffuse
+Version:          0.4.7
+Release:          1%{?dist}
+Summary:          Graphical tool for comparing and merging 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
+Requires:         python >= 2.4, pygtk2 >= 2.10
+Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
-
-BuildArch: noarch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildArch:        noarch
 
 %description
-Diffuse is a graphical tool for merging and comparing text files.  Diffuse is
+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
+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.
 
@@ -29,15 +27,10 @@ Monotone, Subversion, and SVK repositories for comparison and merging.
 %build
 
 %install
-rm -rf %{buildroot}
 mkdir %{buildroot}
 cp -a src/* %{buildroot}/
 desktop-file-validate %{buildroot}/%{_datadir}/applications/diffuse.desktop
 
-
-%clean
-rm -rf %{buildroot}
-
 %post
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 update-desktop-database &> /dev/null || :
@@ -46,11 +39,10 @@ update-desktop-database &> /dev/null || :
 scrollkeeper-update -q || :
 update-desktop-database &> /dev/null || :
 
-
 %files
-%defattr(-,root,root,-)
-%{_bindir}/diffuse
-%{_datadir}/diffuse/
+%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/%{name}
+%{_datadir}/%{name}/*
 %{_datadir}/applications/diffuse.desktop
 %{_datadir}/gnome/help/diffuse/*/diffuse.xml
 %{_datadir}/omf/diffuse/diffuse-*.omf
@@ -62,9 +54,10 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/gnome/help/diffuse/*
 %dir %{_datadir}/omf/diffuse
 
-%doc AUTHORS ChangeLog COPYING README
-
 %changelog
+* Sat May 18 2013 Christopher Meng <rpm at cicku.me> - 0.4.7-1
+- New version.
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 4b06f33..e544064 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 5fbf9023abf0fdc75539f20b42cb40c5  diffuse-0.4.5.tar.bz2
+1cbee487cdfdf37a0d1a94f2f57d89e5  diffuse-0.4.7.tar.bz2