rpms/ddskk/FC-6 ddskk.spec,1.6,1.7

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/ddskk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7841

Modified Files:
	ddskk.spec 
Log Message:
sync with F7:
- specify license is GPL 2 or later

* Tue Jan  2 2007 Jens Petersen <petersen at redhat.com>
- fix preun script for upgrades (#219398)
- fix buildroot path in tutorial path
- remove redundant tutorial manual installation

* Wed Dec 20 2006 Jens Petersen <petersen at redhat.com>
- make install-info failsafe (Ville Skyttä, #219398)
- add post and preun requires for install-info
- drop old skk provides




Index: ddskk.spec
===================================================================
RCS file: /cvs/extras/rpms/ddskk/FC-6/ddskk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ddskk.spec	27 Sep 2006 09:40:44 -0000	1.6
+++ ddskk.spec	10 Aug 2007 05:26:52 -0000	1.7
@@ -6,8 +6,8 @@
 Summary: Daredevil SKK - Simple Kana to Kanji conversion program for Emacs
 Name: ddskk
 Version: 12.2.0
-Release: 9%{?dist}
-License: GPL
+Release: 11%{?dist}
+License: GPLv2+
 Group: Applications/Editors
 URL: http://openlab.ring.gr.jp/skk/main.html
 Source0: http://openlab.ring.gr.jp/skk/maintrunk/ddskk-%{version}.tar.bz2
@@ -16,7 +16,8 @@
 BuildArch: noarch
 BuildRequires: emacs, apel >= %{apelminver}
 Requires: apel >= %{apelminver}
-Provides: skk
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 Obsoletes: skk, ddskk-el
 # for xemacs-21.5
 Patch1: ddskk-12.2.0-xemacs-21.5-fixup-autoload.patch
@@ -54,6 +55,9 @@
 %patch1 -p1 -b .1-xemacs-fixup
 %patch2 -p1 -b .2-charlist
 
+# avoid buildroot in tutorial path
+sed -ie "s!@TUT@!%{_datadir}/skk/SKK.tut!" skk-setup.el.in
+
 
 %build
 
@@ -67,8 +71,6 @@
 make EMACS=emacs PREFIX=%buildroot%{_prefix} \
     SKK_LISPDIR=%buildroot%{_datadir}/emacs/site-lisp/ddskk install
 
-install -m 644 etc/SKK.tut %buildroot%{_datadir}/skk
-install -m 644 etc/SKK.tut.E %buildroot%{_datadir}/skk
 install -m 644 %SOURCE1 %buildroot%{_datadir}/emacs/site-lisp/site-start.d
 
 rm -f %buildroot/%{_infodir}/dir
@@ -86,11 +88,13 @@
 
 
 %post
-/sbin/install-info %{_infodir}/skk.info %{_infodir}/dir
+/sbin/install-info %{_infodir}/skk.info %{_infodir}/dir || :
 
 
 %preun
-/sbin/install-info --delete %{_infodir}/skk.info %{_infodir}/dir
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/skk.info %{_infodir}/dir || :
+fi
 
 
 %files
@@ -109,6 +113,19 @@
 
 
 %changelog
+* Fri Aug 10 2007 Jens Petersen <petersen at redhat.com>
+- specify license is GPL 2 or later
+
+* Tue Jan  2 2007 Jens Petersen <petersen at redhat.com>
+- fix preun script for upgrades (#219398)
+- fix buildroot path in tutorial path
+- remove redundant tutorial manual installation
+
+* Wed Dec 20 2006 Jens Petersen <petersen at redhat.com>
+- make install-info failsafe (Ville Skyttä, #219398)
+- add post and preun requires for install-info
+- drop old skk provides
+
 * Wed Sep 27 2006 Jens Petersen <petersen at redhat.com> - 12.2.0-9
 - add ddskk-string-to-char-list-201524.patch to use string-to-list instead of
   string-to-char-list for XEmacs 21.5 (Ville Skytta, #201524)