packages: gtypist/gtypist.spec, gtypist/gtypist-info.patch - added info pat...

[qboosh]

Author: qboosh                       Date: Sun Sep 18 15:57:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added info patch (unify direntries)
- emacs mode BRs emacs; added bcond and meaningful description for this subpackage
- updated descs and GPL version

---- Files affected:
packages/gtypist:
   gtypist.spec (1.37 -> 1.38) , gtypist-info.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/gtypist/gtypist.spec
diff -u packages/gtypist/gtypist.spec:1.37 packages/gtypist/gtypist.spec:1.38
--- packages/gtypist/gtypist.spec:1.37	Tue Sep 13 16:51:15 2011
+++ packages/gtypist/gtypist.spec	Sun Sep 18 17:57:00 2011
@@ -1,19 +1,25 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	emacs	# Emacs mode
+#
 Summary:	Program for learning typist
 Summary(hu.UTF-8):	Program gépírás tanulásához
 Summary(pl.UTF-8):	Program do nauki bezwzrokowego pisania na klawiaturze
 Name:		gtypist
 Version:	2.8.5
 Release:	1
-License:	GPL
+License:	GPL v3+
 Group:		Applications/Text
 Source0:	http://ftp.gnu.org/gnu/gtypist/%{name}-%{version}.tar.bz2
 # Source0-md5:	fdc223e29288cde265f67bec455a6d8b
 Patch0:		%{name}-ncurses.patch
+Patch1:		%{name}-info.patch
 URL:		http://www.gnu.org/software/gtypist/
-BuildRequires:	autoconf
-BuildRequires:	automake >= 1:1.7.7
-BuildRequires:	gettext-devel >= 0.11
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1:1.8.2
+%{?with_emacs:BuildRequires:	emacs}
+BuildRequires:	gettext-devel >= 0.12.1
 BuildRequires:	ncurses-devel
 BuildRequires:	texinfo
 Obsoletes:	typist
@@ -30,22 +36,23 @@
 lekcji, na razie tylko po angielsku.
 
 %package emacs
-Summary:	Emacs mode
-Summary(hu.UTF-8):	Emacs mód
+Summary:	Emacs mode for editing gtypist's .typ files
+Summary(pl.UTF-8):	Tryb Emacsa do edycji plików .typ gtypista
 Group:		Applications/Editors/Emacs
+# doesn't require gtypist itself
 
 %description emacs
-Emacs mode.
+Emacs mode for editing gtypist's .typ files.
 
-%description emacs -l hu.UTF-8
-Emacs mód.
+%description emacs -l pl.UTF-8
+Tryb Emacsa do edycji plików .typ gtypista.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
-ln -sf version.texi doc/version.cs.texi
-rm -f po/stamp-po
+%{__rm} po/stamp-po
 
 %build
 %{__gettextize}
@@ -66,23 +73,28 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p	/sbin/postshell
+%post	-p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun	-p	/sbin/postshell
+%postun	-p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README AUTHORS NEWS TODO THANKS
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
-%{_infodir}/*.info*
+%doc AUTHORS ChangeLog NEWS QUESTIONS README THANKS TODO
+%attr(755,root,root) %{_bindir}/gtypist
+%attr(755,root,root) %{_bindir}/typefortune
 %{_datadir}/%{name}
+%{_mandir}/man1/gtypist.1*
+%{_mandir}/man1/typefortune.1*
+%{_infodir}/gtypist.info*
+%lang(cs) %{_infodir}/gtypist.cs.info*
 
+%if %{with emacs}
 %files emacs
 %defattr(644,root,root,755)
-%{_datadir}/emacs/site-lisp/gtypist*
+%{_datadir}/emacs/site-lisp/gtypist-mode.el*
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -90,6 +102,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2011/09/18 15:57:00  qboosh
+- added info patch (unify direntries)
+- emacs mode BRs emacs; added bcond and meaningful description for this subpackage
+- updated descs and GPL version
+
 Revision 1.37  2011/09/13 14:51:15  draenog
 - up to 2.8.5
 

================================================================
Index: packages/gtypist/gtypist-info.patch
diff -u /dev/null packages/gtypist/gtypist-info.patch:1.3
--- /dev/null	Sun Sep 18 17:57:06 2011
+++ packages/gtypist/gtypist-info.patch	Sun Sep 18 17:57:00 2011
@@ -0,0 +1,30 @@
+--- gtypist-2.8.5/doc/gtypist.texi.orig	2011-02-24 15:20:28.000000000 +0100
++++ gtypist-2.8.5/doc/gtypist.texi	2011-09-18 17:52:47.358127372 +0200
+@@ -27,9 +27,9 @@
+ @end quotation
+ @end copying
+ 
+- at dircategory Education
+- at direntry Education
+-* GTypist: (gtypist). Documentation of the typing tutor gtypist.
++ at dircategory Miscellaneous:
++ at direntry
++* GTypist: (gtypist).			Documentation of the typing tutor gtypist
+ @end direntry
+ 
+ @titlepage
+--- gtypist-2.8.5/doc/gtypist.cs.texi.orig	2011-03-24 12:19:21.000000000 +0100
++++ gtypist-2.8.5/doc/gtypist.cs.texi	2011-09-18 17:53:11.408128177 +0200
+@@ -30,9 +30,9 @@
+ @end quotation
+ @end copying
+ 
+- at dircategory Education
+- at direntry Education
+-* GTypist: (gtypist). Dokumentace k výukovému programu psaní
++ at dircategory Miscellaneous:
++ at direntry
++* GTypist: (gtypist).			Dokumentace k výukovému programu psaní
+ na klávesnici gtypist.
+ @end direntry
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtypist/gtypist.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtypist/gtypist-info.patch?r1=1.2&r2=1.3&f=u