[putty] Update to latest version from SVN - r8991

[Mark Chappell]

commit b4f56db640db45f55cefaa6a5866eecda98a2297
Author: Mark Chappell <tremble at tremble.org.uk>
Date:   Fri Sep 10 15:05:58 2010 +0200

    Update to latest version from SVN - r8991

 .gitignore        |    1 +
 putty-perms.patch |   10 +++++-----
 putty.desktop     |    6 +++---
 putty.spec        |   52 ++++++++++++++++++++++++++++------------------------
 sources           |    3 +--
 5 files changed, 38 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17c5d73..28ceb2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 putty-0.60.tar.gz
 putty-0.60.tar.gz.RSA
+/putty-8991.tar.bz2
diff --git a/putty-perms.patch b/putty-perms.patch
index 36b6099..b9ba76f 100644
--- a/putty-perms.patch
+++ b/putty-perms.patch
@@ -1,8 +1,8 @@
---- putty-0.60/unix/uxmisc.c.orig	2007-01-20 08:13:57.000000000 -0600
-+++ putty-0.60/unix/uxmisc.c	2007-04-30 11:26:17.000000000 -0500
-@@ -143,7 +143,7 @@
- 	int fd;
- 	assert(mode[0] == 'w');	       /* is_private is meaningless for read */
+--- putty-20100504/unix/uxmisc.c.org	2010-05-19 15:39:00.927479235 +0800
++++ putty-20100504/unix/uxmisc.c	2010-05-19 15:39:32.027256092 +0800
+@@ -144,7 +144,7 @@
+ 	assert(mode[0] == 'w');	       /* is_private is meaningless for read,
+ 					  and tricky for append */
  	fd = open(filename.path, O_WRONLY | O_CREAT | O_TRUNC,
 -		      0700);
 +		      0600);
diff --git a/putty.desktop b/putty.desktop
index 8412560..3a1e5b7 100644
--- a/putty.desktop
+++ b/putty.desktop
@@ -2,8 +2,8 @@
 Name=Putty
 Comment=A SSH, Telnet and Rlogin client
 Exec=putty
-Icon=putty.png
+Icon=putty
 Terminal=false
 Type=Application
-Encoding=UTF-8
-Categories=Application;Network;
+Categories=Network;RemoteAccess;
+StartupNotify=true
diff --git a/putty.spec b/putty.spec
index 31acfb3..4712ed0 100644
--- a/putty.spec
+++ b/putty.spec
@@ -1,67 +1,71 @@
+%define svnver 8991
+
 Name:		putty
 Version:	0.60
-Release:	5%{?dist}
+Release:	6.%{svnver}svn%{?dist}
 Summary:	SSH, Telnet and Rlogin client
 License:	MIT
 Group:		Applications/Internet
 URL:		http://www.chiark.greenend.org.uk/~sgtatham/putty/
-Source0:	http://the.earth.li/~sgtatham/putty/latest/%{name}-%{version}.tar.gz
-Source1:	http://the.earth.li/~sgtatham/putty/latest/%{name}-%{version}.tar.gz.RSA
-Source2:	putty.desktop
-Source3:	putty.png
+#Source0:	http://the.earth.li/~sgtatham/putty/latest/%{name}-%{version}.tar.gz
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands to generate the tarball:
+#  svn export -r %{svnver} svn://svn.tartarus.org/sgt/putty putty-%{svnver}
+#  tar -cjvf putty-%{svnver}.tar.bz2 putty-%{svnver}
+Source0:	%{name}-%{svnver}.tar.bz2
+Source2:	%{name}.desktop
+Source3:	%{name}.png
 Patch0:		putty-perms.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gtk+-devel desktop-file-utils sed
+BuildRequires:	gtk2-devel krb5-devel halibut desktop-file-utils
 
 %description
 Putty is a SSH, Telnet & Rlogin client - this time for Linux.
 
 %prep
 
-%setup -q
+%setup -q -n %{name}-%{svnver}
 %patch0 -p1
 
 %build
-%{__sed} -i -e "/.*sbcsdat.c/d" manifest
 ./mkfiles.pl
+make -C doc
 pushd unix
 %{__sed} -i -e "s/-O2 -Wall -Werror/$RPM_OPT_FLAGS/g" \
 	-e "s,/usr/local,%{_prefix},g" \
 	Makefile.gtk
 ln -s Makefile.gtk Makefile
-make %{?_smp_mflags}
 popd
+make %{?_smp_mflags} VER=-DSNAPSHOT=%{version} -C unix
 
 %install
 rm -rf $RPM_BUILD_ROOT
-pushd unix
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-%makeinstall
-popd
+install -d  html
+install -pm 0644 doc/*.html html
+make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} INSTALL="install -p" -C unix
 
 desktop-file-install \
-  --vendor fedora \
+  --vendor "" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode 644 \
-  --add-category X-Fedora \
   %{SOURCE2}
 
 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
+* Fri Sep 10 2010 Mark Chappell <tremble at fedoraproject.org> - 0.60-6.8991svn
+- Update to latest GTK2 version from SVN (r8991)
+
 * 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
 
diff --git a/sources b/sources
index b97610e..4b6b680 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-07e65fd98b16d115ae38a180bfb242e2  putty-0.60.tar.gz
-6e81a3ce4c32b02d656b1654d4cdf193  putty-0.60.tar.gz.RSA
+19250de33bbfd40e05f15a8c98f485bb  putty-8991.tar.bz2