[emacs-common-ddskk/f14/master] Import emacs-common-ddskk.

Daiki Ueno ueno at fedoraproject.org
Fri Oct 22 02:59:04 UTC 2010


commit 336a47ff1c38372ad52fdc60843f483509f42fba
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Fri Oct 22 12:02:48 2010 +0900

    Import emacs-common-ddskk.

 .gitignore              |    1 +
 ddskk-init.el           |    8 +
 emacs-common-ddskk.spec |  368 +++++++++++++++++++++++++++++++++++++++++++++++
 sources                 |    1 +
 4 files changed, 378 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..7127af8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/ddskk-14.1.tar.gz
diff --git a/ddskk-init.el b/ddskk-init.el
new file mode 100644
index 0000000..2c652e2
--- /dev/null
+++ b/ddskk-init.el
@@ -0,0 +1,8 @@
+;;; ddskk-init.el
+
+(require 'skk-setup)
+(require 'skk-leim)
+
+(setq skk-server-host "localhost")
+(setq skk-large-jisyo "/usr/share/skk/SKK-JISYO.L")
+(setq skk-tut-file "/usr/share/skk/SKK.tut")
diff --git a/emacs-common-ddskk.spec b/emacs-common-ddskk.spec
new file mode 100644
index 0000000..e2a6447
--- /dev/null
+++ b/emacs-common-ddskk.spec
@@ -0,0 +1,368 @@
+%global pkg ddskk
+%global pkgname Daredevil SKK
+
+Summary: Daredevil SKK - Simple Kana to Kanji conversion program for Emacs
+Name: emacs-common-ddskk
+Version: 14.1
+Release: 4%{?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.gz
+Source1: ddskk-init.el
+BuildArch: noarch
+BuildRequires: emacs, apel
+BuildRequires: xemacs, apel-xemacs
+Requires: apel
+Requires(post): info
+Requires(preun): info
+Obsoletes: ddskk
+
+%description
+Daredevil SKK is a branch of SKK (Simple Kana to Kanji conversion program,
+an input method of Japanese). It forked from the maintrunk, SKK version 10.56.
+It consists of a simple core and many optional programs which provide extensive
+features, however, our target is to more simplify core, and more expand its
+optional features.
+
+This package does not include dictionaries or a skkserver. Please install them
+separately.
+
+%package -n emacs-%{pkg}
+Summary:	Compiled elisp files to run %{pkgname} under GNU Emacs
+Group:		Applications/Editors
+Requires:	emacs(bin) >= %{_emacs_version}
+Requires:	emacs-common-%{pkg} = %{version}-%{release}
+Provides:	ddskk = %{version}-%{release}
+
+%description -n emacs-%{pkg}
+This package contains the byte compiled elisp packages to run %{pkgname}
+with GNU Emacs.
+
+
+%package -n emacs-%{pkg}-el
+Summary:	Elisp source files for %{pkgname} under GNU Emacs
+Group:		Applications/Editors
+Requires:	emacs-%{pkg} = %{version}-%{release}
+
+%description -n emacs-%{pkg}-el
+This package contains the elisp source files for %{pkgname} under GNU
+Emacs. You do not need to install this package to run
+%{pkgname}. Install the emacs-%{pkg} package to use %{pkgname} with
+GNU Emacs.
+
+
+%package -n xemacs-%{pkg}
+Summary:	Compiled elisp files to run %{pkgname} under XEmacs
+Group:		Applications/Editors
+Requires:	xemacs(bin) >= %{_xemacs_version}
+Requires:	emacs-common-%{pkg} = %{version}-%{release}
+Provides:	ddskk = %{version}-%{release}
+
+%description -n xemacs-%{pkg}
+This package contains the byte compiled elisp packages to use %{pkgname} with
+XEmacs.
+
+
+%package -n xemacs-%{pkg}-el
+Summary:	Elisp source files for %{pkgname} under XEmacs
+Group:		Applications/Editors
+Requires:	xemacs-%{pkg} = %{version}-%{release}
+
+%description -n xemacs-%{pkg}-el
+This package contains the elisp source files for %{pkgname} under
+XEmacs. You do not need to install this package to run
+%{pkgname}. Install the xemacs-%{pkg} package to use %{pkgname} with
+XEmacs.
+
+
+%prep
+%setup -q -n %{pkg}-%{version}
+
+# We can't set SKK-MK-texinfo-coding-system in SKK-CFG since it is
+# defined with defconst.
+
+sed -ie "s!\(SKK-MK-texinfo-coding-system\) 'iso-2022-jp!\1 'utf-8!" SKK-MK
+
+# We first convert Shift_JIS docs to UTF-8 and save it as *.UTF-8.
+# Then do the same thing for ISO-2022-JP docs (the rest of docs ending
+# with .ja).  Finally, change the filenames back to the originals.
+
+for i in READMEs/README.MacOSX.ja READMEs/README.w32.ja
+do
+	iconv -f Shift_JIS -t UTF-8 $i > ${i}.UTF-8
+	rm $i
+done
+
+for i in READMEs/*.ja
+do
+	iconv -f ISO-2022-JP -t UTF-8 $i > ${i}.UTF-8
+done
+
+for i in READMEs/*.UTF-8
+do
+	mv $i ${i%%.UTF-8}
+done
+
+# avoid buildroot in tutorial path
+sed -ie "s!@TUT@!%{_datadir}/skk/SKK.tut!" skk-setup.el.in
+
+
+%build
+
+
+%install
+# needed for make install-info
+mkdir -p %{buildroot}%{_datadir}/info
+
+cat >> SKK-CFG <<EOF
+(setq PREFIX "%{buildroot}%{_prefix}")
+(setq SKK_LISPDIR "%{buildroot}%{_emacs_sitelispdir}/ddskk")
+EOF
+
+make EMACS=emacs install
+
+%{_emacs_bytecompile} skk-setup.el
+install -p -m 644 skk-setup.elc %{buildroot}%{_emacs_sitelispdir}/%{pkg}
+
+mkdir -p %{buildroot}%{_emacs_sitestartdir}
+install -p -m 644 %SOURCE1 %{buildroot}%{_emacs_sitestartdir}
+
+make clean
+cat >> SKK-CFG <<EOF
+(setq SKK_PREFIX "ddskk")
+(setq PACKAGEDIR "%{buildroot}%{_xemacs_sitepkgdir}")
+EOF
+make package
+make install-package
+
+%{_xemacs_bytecompile} skk-setup.el
+install -p -m 644 skk-setup.elc %{buildroot}%{_xemacs_sitelispdir}/%{pkg}
+
+mkdir -p %{buildroot}%{_xemacs_sitestartdir}
+install -p -m 644 %SOURCE1 %{buildroot}%{_xemacs_sitestartdir}
+
+rm %{buildroot}%{_xemacs_sitepkgdir}/info/skk.info*
+rm -f %{buildroot}%{_infodir}/dir
+
+
+%post
+/sbin/install-info %{_infodir}/skk.info %{_infodir}/dir || :
+
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/skk.info %{_infodir}/dir || :
+fi
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog READMEs
+%{_datadir}/skk
+%{_infodir}/*
+
+
+%files -n emacs-%{pkg}
+%defattr(-,root,root,-)
+%{_emacs_sitelispdir}/%{pkg}/*.elc
+%{_emacs_sitestartdir}/*.el
+%dir %{_emacs_sitelispdir}/%{pkg}
+
+
+%files -n emacs-%{pkg}-el
+%defattr(-,root,root,-)
+%{_emacs_sitelispdir}/%{pkg}/*.el
+
+
+%files -n xemacs-%{pkg}
+%defattr(-,root,root,-)
+%{_xemacs_sitelispdir}/%{pkg}/*.elc
+%{_xemacs_sitestartdir}/*.el
+%dir %{_xemacs_sitelispdir}/%{pkg}
+%{_xemacs_sitepkgdir}/etc/%{pkg}/*
+# xemacs-common should own the parent directory (Bug#645621).
+# %dir %{_xemacs_sitepkgdir}/etc/%{pkg}
+%dir %{_xemacs_sitepkgdir}/etc/
+
+
+%files -n xemacs-%{pkg}-el
+%defattr(-,root,root,-)
+%{_xemacs_sitelispdir}/%{pkg}/*.el
+
+
+%changelog
+* Fri Oct 22 2010 Daiki Ueno <dueno at redhat.com> - 14.1-4
+- own %%{_xemacs_sitepkgdir}/etc/ instead of etc/ddskk, as a
+  workaround of #645621
+- use curly braces where %%buildroot macro is used
+
+* Thu Oct 21 2010 Daiki Ueno <dueno at redhat.com> - 14.1-3
+- remove Emacs coding cookie for this spec
+
+* Thu Oct 21 2010 Daiki Ueno <dueno at redhat.com> - 14.1-2
+- drop buildroot, %%clean and cleaning of buildroot in %%install
+- use correct scriptlet for texinfo files
+- remove %%apel_minver since the current apel is newer
+- use correct file attributes for the main package
+- remove "skk" and "ddskk-el" from Obsoletes: since they are even
+  missing in the current dist
+
+* Mon Sep  6 2010 Daiki Ueno <dueno at redhat.com> - 14.1-1
+- new upstream release
+- remove ddskk-char.patch (already applied in the upstream tarball)
+- pass "-p" option to install
+
+* Thu Apr 15 2010 Daiki Ueno <dueno at redhat.com> - 13.1-3
+- rename the package from ddskk to emacs-common-ddskk (closes #531688)
+  and split into subpackages following the emacs packaging policy.
+- enable XEmacs build again (patch from Jerry James, #532624).
+- change the encoding of Japanese docs/info to UTF-8.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 13.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 22 2009 Jens Petersen <petersen at redhat.com> - 13.1-1
+- update to 13.1
+  - bump apel_minver to 10.7
+  - all 3 old patches for 12.2.0 are now upstream
+  - use SKK-CFG for install prefixes
+- add bcond for xemacs and disable for now since no apel 10.7 for xemacs
+
+
+* Mon Jun 22 2009 Jens Petersen <petersen at redhat.com> - 12.2.0-13
+- fix skk-e21 error with emacs22 (patch from Masatake Yamato, #503185)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12.2.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* 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> - 12.2.0-11
+- 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> - 12.2.0-10
+- 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)
+
+* Fri Aug  4 2006 Jens Petersen <petersen at redhat.com> - 12.2.0-8
+- add ddskk-12.2.0-xemacs-21.5-fixup-autoload.patch for autoload generation
+  in xemacs 21.5
+
+* Wed Nov 16 2005 Jens Petersen <petersen at redhat.com> - 12.2.0-7
+- require and buildrequire apel version 10.6
+
+* Wed Jul 13 2005 Jens Petersen <petersen at redhat.com> - 12.2.0-6
+- initial import to Fedora Extras
+- bring back the xemacs subpackages
+
+* Wed Feb 23 2005 Elliot Lee <sopwith at redhat.com> 12.2.0-5
+- Remove xemacs
+
+* Wed Oct  6 2004 Jens Petersen <petersen at redhat.com> - 12.2.0-4
+- drop requirements on emacs/xemacs for -nox users
+  (Lars Hupfeldt Nielsen, 134479)
+
+* Wed Sep 22 2004 Jens Petersen <petersen at redhat.com> - 12.2.0-3
+- clean up ddskk-init.el
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Nov  5 2003 Jens Petersen <petersen at redhat.com> - 12.2.0-1
+- 12.2.0 release
+- ddskk-11.6.0-tmp-file.patch no longer needed
+
+* Mon Jul 28 2003 Jens Petersen <petersen at redhat.com> - 11.6.0-12
+- ddskk no longer provides ddskk-el
+- don't compress Japanese info files
+- install/uninstall info manual in info dir file during post/preun
+
+* Thu Jul 10 2003 Jens Petersen <petersen at redhat.com> - 11.6.0-11
+- apply ddskk-11.6.0-tmp-file.patch from debian to fix temp file vulnerability
+  CAN-2003-0539 (#98924)
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Tue Dec 24 2002 Jens Petersen <petersen at redhat.com> 11.6.0-9
+- place xemacs package under datadir
+- setup quietly
+- use buildroot macro instead of RPM_BUILD_ROOT
+- include info files except info dir file
+- own mule-packages and down
+- update url
+- encode spec file in utf-8
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Mon Mar 11 2002 Jens Petersen <petersen at redhat.com> 21.6.0-6
+- provide ddskk-el to make rpmlint happy
+- don't buildrequire semi
+
+* Mon Feb 25 2002 Jens Petersen <petersen at redhat.com> 21.6.0-5
+- free ride through the build system
+
+* Thu Jan 31 2002 Jens Petersen <petersen at redhat.com> 21.6.0-4
+- install in mule-packages not site-packages
+- own lisp/skk dir
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com> 21.6.0-3
+- automated rebuild
+
+* Tue Jan 8 2002 Jens Petersen <petersen at redhat.com> 21.6.0-2
+- Updated changelog entry below for 21.6.0-1
+
+* Tue Jan 8 2002 Jens Petersen <petersen at redhat.com> 21.6.0-1
+- Update to 11.6.0 release
+- Make XEmacs package
+- Add filevar for iso-8859-1 coding for teg
+- Don't need to mkdir site-lisp/ddskk datadir/skk, but need datadir/info
+
+* Wed Aug 29 2001 Trond Eivind Glomsrød <teg at redhat.com> 21.3.20010617-2
+- Add semi as a BuildPrereq (#45159)
+- s/Copyright/License/
+- Don't define a name on top and then use it in the header
+ 
+* Mon Jun 25 2001 SATO Satoru <ssato at redhat.com> 21.3.20010617-1
+- 2001.6.17
+- fix the dependency (now we have the apel alone).
+- ddskk-el is disused
+
+* Wed Feb 28 2001 SATO Satoru <ssato at redhat.com>
+- fix the Group
+
+* Wed Feb 28 2001 SATO Satoru <ssato at redhat.com>
+- fix the dependencies: [Build]Requires
+- add ddskk-init.el
+
+* Wed Feb 28 2001 SATO Satoru <ssato at redhat.com>
+- rebuild to re-import into the tree
+- new upstream snapshot
+
+* Mon Dec 28 2000 SATO Satoru <ssato at redhat.com>
+- fix SPEC
+
+* Mon Dec 25 2000 SATO Satoru <ssato at redhat.com>
+- new upstream (cvs current snapshot)
+
+* Mon Sep 11 2000 Matt Wilson <msw at redhat.com>
+- added %%defattr(-,root,root) to the el subpackage
+
+* Tue Sep  6 2000 Satoru Sato <ssato at redhat.com>
+- fix SPEC (check dependencies)
+
+* Tue Sep  5 2000 Satoru Sato <ssato at redhat.com>
+- Initial release
diff --git a/sources b/sources
index e69de29..7a9e945 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+59583036ff47bed82d0138cd31611833  ddskk-14.1.tar.gz


More information about the scm-commits mailing list