rpms/ddskk/devel .cvsignore, 1.2, 1.3 ddskk.spec, 1.12, 1.13 sources, 1.2, 1.3
Jens Petersen
petersen at fedoraproject.org
Mon Jun 22 07:47:26 UTC 2009
- Previous message (by thread): rpms/perl-Mouse/F-10 perl-Mouse.spec,1.9,1.10 sources,1.9,1.10
- Next message (by thread): rpms/wordpress/EL-5 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 wordpress.spec, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/extras/rpms/ddskk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16502
Modified Files:
.cvsignore ddskk.spec sources
Log Message:
- update to 13.1 (bump apel_minver to 10.7)
- add bcond for xemacs and disable for now since no apel 10.7 for xemacs
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ddskk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 13 Jul 2005 09:30:45 -0000 1.2
+++ .cvsignore 22 Jun 2009 07:46:55 -0000 1.3
@@ -1 +1 @@
-ddskk-12.2.0.tar.bz2
+ddskk-13.1.tar.gz
Index: ddskk.spec
===================================================================
RCS file: /cvs/extras/rpms/ddskk/devel/ddskk.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ddskk.spec 22 Jun 2009 06:42:10 -0000 1.12
+++ ddskk.spec 22 Jun 2009 07:46:55 -0000 1.13
@@ -1,28 +1,32 @@
# [for Emacs] -*- coding: utf-8 -*-
-%define apelminver 10.6
+%bcond_with xemacs
+
+%define apel_minver 10.7
+
+%if %{with xemacs}
%define pkgdir %{_datadir}/xemacs/mule-packages
+%endif
Summary: Daredevil SKK - Simple Kana to Kanji conversion program for Emacs
Name: ddskk
-Version: 12.2.0
-Release: 13%{?dist}
+Version: 13.1
+Release: 1%{?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
+Source0: http://openlab.ring.gr.jp/skk/maintrunk/ddskk-%{version}.tar.gz
Source1: ddskk-init.el
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
-BuildRequires: emacs, apel >= %{apelminver}
-Requires: apel >= %{apelminver}
+BuildRequires: emacs, apel >= %{apel_minver}
+%if %{with xemacs}
+BuildRequires: xemacs, apel-xemacs >= %{apel_minver}
+%endif
+Requires: apel >= %{apel_minver}
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
-Patch2: ddskk-string-to-char-list-201524.patch
-Patch3: ddskk-emacs22-503185.patch
%description
Daredevil SKK is a branch of SKK (Simple Kana to Kanji conversion program,
@@ -34,11 +38,11 @@ optional features.
This package does not include dictionaries or a skkserver. Please install them
separately.
+%if %{with xemacs}
%package xemacs
Summary: Daredevil SKK - Simple Kana to Kanji conversion program for XEmacs
Group: Applications/Editors
Requires: apel-xemacs
-BuildRequires: apel-xemacs, xemacs
%description xemacs
Daredevil SKK is a branch of SKK (Simple Kana to Kanji conversion program,
@@ -49,13 +53,10 @@ optional features.
This package does not include dictionaries or a skkserver. Please install them
separately.
-
+%endif
%prep
%setup -q
-%patch1 -p1 -b .1-xemacs-fixup~
-%patch2 -p1 -b .2-charlist~
-%patch3 -p1 -b .3-emacs22~
# avoid buildroot in tutorial path
sed -ie "s!@TUT@!%{_datadir}/skk/SKK.tut!" skk-setup.el.in
@@ -70,16 +71,21 @@ mkdir -p %buildroot%{_datadir}/emacs/sit
# needed for make install-info
mkdir -p %buildroot%{_datadir}/info
-make EMACS=emacs PREFIX=%buildroot%{_prefix} \
- SKK_LISPDIR=%buildroot%{_datadir}/emacs/site-lisp/ddskk install
+cat >> SKK-CFG <<EOF
+(setq PREFIX "%buildroot%{_prefix}")
+(setq SKK_LISPDIR "%buildroot%{_datadir}/emacs/site-lisp/ddskk")
+EOF
+
+make EMACS=emacs install
install -m 644 %SOURCE1 %buildroot%{_datadir}/emacs/site-lisp/site-start.d
rm -f %buildroot/%{_infodir}/dir
+%if %{with xemacs}
make clean
-
make PACKAGEDIR=%buildroot%{pkgdir} install-package
+%endif
# don't compress ja info pages
%define __os_install_post %{nil}
@@ -108,13 +114,19 @@ fi
%{_infodir}/*
+%if %{with xemacs}
%files xemacs
%defattr(-,root,root,-)
%doc ChangeLog READMEs
%{pkgdir}
+%endif
%changelog
+* Mon Jun 22 2009 Jens Petersen <petersen at redhat.com> - 13.1-1
+- update to 13.1 (bump apel_minver to 10.7)
+- 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)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ddskk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 13 Jul 2005 09:30:45 -0000 1.2
+++ sources 22 Jun 2009 07:46:55 -0000 1.3
@@ -1 +1 @@
-3b0f2a2ff13508d6dbb2a3b09369c444 ddskk-12.2.0.tar.bz2
+5ae2c04de4a21564b0e9695afa006167 ddskk-13.1.tar.gz
- Previous message (by thread): rpms/perl-Mouse/F-10 perl-Mouse.spec,1.9,1.10 sources,1.9,1.10
- Next message (by thread): rpms/wordpress/EL-5 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 wordpress.spec, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list