[gwsmhg: 2/2] Merge the F17 branch into rahwide/f18, cleanup spec

[Peter Robinson]

commit d0474f5afe8fddcc5e2d1d46189d2c9cc0637ffd
Merge: 42e4fca dfa1543
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Feb 21 11:08:01 2013 +0000

    Merge the F17 branch into rahwide/f18, cleanup spec

 .gitignore  |    1 +
 gwsmhg.spec |   25 ++++++++-----------------
 sources     |    2 +-
 3 files changed, 10 insertions(+), 18 deletions(-)
---
diff --cc gwsmhg.spec
index e366965,0033b2c..2f37867
--- a/gwsmhg.spec
+++ b/gwsmhg.spec
@@@ -9,7 -9,7 +9,6 @@@ Group:          Development/Tool
  License:        GPLv2
  Url:            http://gwsmhg.sourceforge.net/
  Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
--BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildArch:      noarch
  BuildRequires:  python-devel desktop-file-utils
@@@ -25,24 -25,24 +24,16 @@@ space
  %prep
  %setup -q
  
--
  %build
--%{__python} setup.py build
--
++python setup.py build
  
  %install
--rm -rf $RPM_BUILD_ROOT
--
--%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
++python setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
  
  desktop-file-install gwsmhg.desktop \
      --dir $RPM_BUILD_ROOT%{_datadir}/applications
  
  
--%clean
--rm -rf $RPM_BUILD_ROOT
--
--
  %files
  %defattr(-,root,root,-)
  %doc COPYING copyright
@@@ -53,11 -53,8 +44,11 @@@
  
  
  %changelog
- * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-5
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
++* Thu Feb 21 2013 Peter Robinson <pbrobinson at fedoraproject.org> 0.13.1-2
++- Merge the F17 branch into rahwide/f18, cleanup spec
 +
- * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-4
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ * Tue Mar 13 2012 Mads Kiilerich <mads at kiilerich.com> - 0.13.1-1
+ - gwsmhg-0.13.1
  
  * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild