SPECS: putty.spec - X11 renamed to main package - main package ren...

[glen]

Author: glen                         Date: Sun Jul 17 11:10:16 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- X11 renamed to main package
- main package renamed to progs package
- cleanups

---- Files affected:
SPECS:
   putty.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/putty.spec
diff -u SPECS/putty.spec:1.29 SPECS/putty.spec:1.30
--- SPECS/putty.spec:1.29	Sat Jul 16 13:25:46 2005
+++ SPECS/putty.spec	Sun Jul 17 13:10:11 2005
@@ -1,18 +1,14 @@
 # $Revision$, $Date$
 # TODO
-# - fix stupid package naming. if want putty, i install putty and i get useless
-#   programs and no putty binary???  move putty to putty-common, and make
-#   putty-X11 the main package
-%define		snapshot	2004-02-12
-%define		_snapver	%(echo %{snapshot} | tr -d -)
+# - correct pl summary/descriptions
 Summary:	Remembers telnet and SSH sessions
 Summary(pl):	Zapamiętywanie sesji telnet i SSH
 Name:		putty
 Version:	0.58
-Release:	1
+Release:	2
 License:	MIT-licensed
 Group:		X11/Applications/Networking
-Source0:	http://the.earth.li/~sgtatham/putty/latest/%{name}-%{version}.tar.gz	
+Source0:	http://the.earth.li/~sgtatham/putty/latest/%{name}-%{version}.tar.gz
 # Source0-md5:	ffb78a7db7e4802896189b2112714a9f
 Source1:	%{name}.desktop
 Source2:	%{name}tel.desktop
@@ -21,6 +17,7 @@
 Source5:	%{name}cfg.xpm
 Patch0:		%{name}-DESTDIR.patch
 URL:		http://www.tartarus.org/~simon/putty-unix/
+Obsoletes:	%{name}-X11
 BuildRequires:	gtk+-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,37 +30,41 @@
 łącznie z emulatorem terminala xterm, przeniesioną na platformę
 uniksową.
 
-%package X11
-Summary:	Remembers telnet and SSH sessions - putty application
+%package progs
+Summary:	PuTTY additional programs
 Summary(pl):	Zapamiętywanie sesji telnet i SSH - program putty
 Group:		X11/Applications/Networking
 
-%description X11
+%description progs
 PuTTY is a free implementation of telnet and SSH for Win32 platforms,
 along with an xterm terminal emulator, ported into Unix platform.
-This package contains only putty X11 application.
 
-%description X11 -l pl
+This package contains additional programs for PuTTY.
+
+%description progs -l pl
 PuTTY jest darmową implementacją telnetu i SSH dla platform Win32,
 łącznie z emulatorem terminala xterm, przeniesioną na platformę
 uniksową.
-Ten pakiet zawiera tylko program putty dla X11.
+
+Ten pakiet zawiera additional program for PuTTY.
 
 %package puttytel
-Summary:	Remembers telnet and SSH sessions - puttytel application
+Summary:	puttytel application
 Summary(pl):	Zapamiętywanie sesji telnet i SSH - program puttytel
 Group:		X11/Applications/Networking
 
 %description puttytel
 PuTTY is a free implementation of telnet and SSH for Win32 platforms,
 along with an xterm terminal emulator, ported into Unix platform.
-This package contains only puttytel X11 application.
+
+This package contains puttytel application.
 
 %description puttytel -l pl
 PuTTY jest darmową implementacją telnetu i SSH dla platform Win32,
 łącznie z emulatorem terminala xterm, przeniesioną na platformę
 uniksową.
-Ten pakiet zawiera tylko program puttytel dla X11.
+
+Ten pakiet zawiera program puttytel.
 
 %package pterm
 Summary:	PuTTY terminal
@@ -115,6 +116,13 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENCE README README.txt
+%attr(755,root,root) %{_bindir}/putty
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.xpm
+%{_mandir}/man1/putty.1*
+
+%files progs
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/plink
 %attr(755,root,root) %{_bindir}/pscp
 %attr(755,root,root) %{_bindir}/psftp
@@ -124,13 +132,6 @@
 %{_mandir}/man1/psftp.1*
 %{_mandir}/man1/puttygen.1*
 
-%files X11
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/putty
-%{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/%{name}.xpm
-%{_mandir}/man1/putty.1*
-
 %files puttytel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}tel
@@ -151,6 +152,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2005/07/17 11:10:11  glen
+- X11 renamed to main package
+- main package renamed to progs package
+- cleanups
+
 Revision 1.29  2005/07/16 11:25:46  glen
 - propose to fix package naming
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/putty.spec?r1=1.29&r2=1.30&f=u