[hitori: 2/2] merge latest version from F-16

[Peter Robinson]

commit 1b99ed0f9a7987c9b41f5c78004d7b2d12735534
Merge: a6a7b2b 4f79ab4
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Mar 3 16:10:48 2012 +0000

    merge latest version from F-16

 .gitignore  |    1 +
 hitori.spec |   18 ++++++++----------
 sources     |    2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)
---
diff --cc hitori.spec
index b7b7a06,c0c563a..e044e45
--- a/hitori.spec
+++ b/hitori.spec
@@@ -9,7 -9,7 +9,6 @@@ Group:		Amusements/Game
  License:	GPLv3+ and CC-BY-SA
  URL:		http://live.gnome.org/Hitori
  Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.xz
--BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires:	desktop-file-utils
  BuildRequires:	gettext
@@@ -50,16 -50,16 +49,12 @@@ make %{?_smp_mflags
  
  
  %install
--rm -rf $RPM_BUILD_ROOT
  make install DESTDIR=$RPM_BUILD_ROOT
  
  %find_lang %{name}
  
  desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
  
--%clean
--rm -rf $RPM_BUILD_ROOT
--
  %post
  touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
  
@@@ -85,15 -85,13 +80,18 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
- * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-3
++* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
- * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.3.0-2
++* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.3.1-2
 +- Rebuild for new libpng
  
+ * Sun Jun 19 2011 Mario Blättermann <mariobl at fedoraproject.org> 0.3.1-1
+ - New upstream version
+ - Fixes GNOME bug #652399 (l10n doesn't work)
  
  * Sun Jun 12 2011 Mario Blättermann <mariobl at fedoraproject.org> 0.3.0-1
- - New ustream version
+ - New upstream version
  
  * Fri Feb 18 2011 Mario Blättermann <mariobl at fedoraproject.org> 0.2.6-3
  - Changed native English and German description