[putty/el5/master: 11/11] Update to latest version from SVN (GTK2)

[Mark Chappell]

commit 6a0ff83232bb29f5153b2b14f6ee4bd4d3eba43f
Merge: 570c9e2 6bc01a4
Author: Mark Chappell <tremble at tremble.org.uk>
Date:   Fri Sep 10 16:11:02 2010 +0200

    Update to latest version from SVN (GTK2)

 .gitignore        |    3 +-
 putty-perms.patch |   10 ++++----
 putty.desktop     |    6 ++--
 putty.spec        |   61 +++++++++++++++++++++++++++++++++--------------------
 sources           |    3 +-
 5 files changed, 48 insertions(+), 35 deletions(-)
---
diff --cc .gitignore
index 17c5d73,7e319b9..2e3f416
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,1 @@@
--putty-0.60.tar.gz
--putty-0.60.tar.gz.RSA
 -/putty-8991.tar.bz2
 -/putty-20100910.tar.bz2
++putty-20100910.tar.bz2
diff --cc putty.spec
index 02bf9ff,6f03238..78fa965
--- a/putty.spec
+++ b/putty.spec
@@@ -18,7 -24,7 +24,11 @@@ Putty is a SSH, Telnet & Rlogin client 
  
  %prep
  
++<<<<<<< HEAD
 +%setup -q
++=======
+ %setup -q -n %{name}-%{svndate}
++>>>>>>> master
  %patch0 -p1
  
  %build
@@@ -50,18 -51,25 +55,28 @@@ desktop-file-install 
  
  install -m644 -D -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/putty.png
  
+ %clean
+ rm -rf $RPM_BUILD_ROOT
+ 
  %files
  %defattr(-,root,root)
- %doc LICENCE
+ %doc LICENCE html
  %{_bindir}/*
- %{_mandir}/man1/*
+ %{_mandir}/man1/*.1*
  %{_datadir}/applications/*
- %{_datadir}/pixmaps/putty.png
+ %{_datadir}/pixmaps/%{name}.png
  
- %clean
- rm -rf $RPM_BUILD_ROOT
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Fri Sep 10 2010 Mark Chappell <tremble at fedoraproject.org> - 0.60-6.20100910svn
+ - Bump version in line with packaging specs
+ 
+ * Fri Sep 10 2010 Mark Chappell <tremble at fedoraproject.org> - 0.60-6.8991svn
+ - Update to latest GTK2 version from SVN (r8991)
+ 
++>>>>>>> master
  * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.60-5
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild