rpms/jfbterm/devel jfbterm-0.4.6-conf.patch, NONE, 1.1 jfbterm-0.4.7-configure-header.patch, NONE, 1.1 jfbterm-0.4.7-hang-onexit.patch, NONE, 1.1 jfbterm-0.4.7-infinite_loop.patch, NONE, 1.1 jfbterm-0.4.7-mmap-newkernel.patch, NONE, 1.1 jfbterm-0.4.7-remove-sticky.patch, NONE, 1.1 jfbterm-0.4.7-remove-warning.patch, NONE, 1.1 jfbterm-0.4.7-userspace.patch, NONE, 1.1 jfbterm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Mon Aug 21 02:16:10 UTC 2006
Author: mtasaka
Update of /cvs/extras/rpms/jfbterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19018/devel
Modified Files:
.cvsignore sources
Added Files:
jfbterm-0.4.6-conf.patch jfbterm-0.4.7-configure-header.patch
jfbterm-0.4.7-hang-onexit.patch
jfbterm-0.4.7-infinite_loop.patch
jfbterm-0.4.7-mmap-newkernel.patch
jfbterm-0.4.7-remove-sticky.patch
jfbterm-0.4.7-remove-warning.patch
jfbterm-0.4.7-userspace.patch jfbterm.spec
Log Message:
auto-import jfbterm-0.4.7-6 on branch devel from jfbterm-0.4.7-6.src.rpm
jfbterm-0.4.6-conf.patch:
--- NEW FILE jfbterm-0.4.6-conf.patch ---
--- jfbterm-0.4.6/jfbterm.conf.sample.orig 2004-12-28 03:12:35.772461000 +0900
+++ jfbterm-0.4.6/jfbterm.conf.sample 2004-12-28 03:16:13.993266987 +0900
@@ -19,29 +19,29 @@
# Absolute path or relative path to PWD
#
###############################################################################
-fontset : iso646-1973irv,pcf,L,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
+fontset : iso646-1973irv,pcf,L,/usr/share/fonts/jfbterm/shnm8x16r.pcf.gz
+fontset: ansix3.4-1968,alias,L,iso646-1973irv
-+fontset: jisc6226-1978,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz
++fontset: jisc6226-1978,pcf,L,/usr/share/fonts/jfbterm/shnmk16.pcf.gz
+fontset: jisx0208-1983,alias,L,jisc6226-1978
-+fontset: jisc6220-1969roman,pcf,L,/usr/X11R6/lib/X11/fonts/misc/a18rk.pcf.gz
++fontset: jisc6220-1969roman,pcf,L,/usr/share/fonts/jfbterm/shnm8x16r.pcf.gz
+fontset: jisc6220-1969kana,alias,R,jisc6220-1969roman
-+fontset: jisx0212-1990,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jksp16.pcf.gz
-+fontset: gb2312-80,pcf,L,/usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz
-+fontset: ksc5601-1987,pcf,L,/usr/X11R6/lib/X11/fonts/misc/hanglg16.pcf.gz
-+fontset: iso8859.1-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
-+fontset: iso8859.2-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt2-16-etl.pcf.gz
++fontset: jisx0212-1990,pcf,L,/usr/share/fonts/jfbterm/jisksp16-1990.pcf.gz
++fontset: gb2312-80,pcf,L,/usr/share/fonts/jfbterm/gb16fs.pcf.gz
++fontset: ksc5601-1987,pcf,L,/usr/share/fonts/jfbterm/hanglg16.pcf.gz
++fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/jfbterm/8x16.pcf.gz
++fontset: iso8859.2-1987,pcf,R,/usr/share/fonts/jfbterm/8x13-ISO8859-2.pcf.gz
+fontset: iso8859.3-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt3-16-etl.pcf.gz
+fontset: iso8859.4-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt4-16-etl.pcf.gz
-+fontset: iso8859.5-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/cyr16-etl.pcf.gz
-+fontset: iso8859.7-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/grk16-etl.pcf.gz
-+fontset: iso8859.8-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/heb16-etl.pcf.gz
-+fontset: iso8859.9-1989,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt5-16-etl.pcf.gz
++fontset: iso8859.5-1988,pcf,R,/usr/share/fonts/jfbterm/8x13-ISO8859-5.pcf.gz
++fontset: iso8859.7-1987,pcf,R,/usr/share/fonts/jfbterm/8x13-ISO8859-7.pcf.gz
++fontset: iso8859.8-1988,pcf,R,/usr/share/fonts/jfbterm/8x13-ISO8859-8.pcf.gz
++fontset: iso8859.9-1989,pcf,R,/usr/share/fonts/jfbterm/8x13-ISO8859-9.pcf.gz
+fontset: iso8859.10-1992,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
+fontset: iso8859.13-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
-+fontset: iso8859.14-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz
-+fontset: iso8859.15-1999,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
++fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/jfbterm/8x13-ISO8859-14.pcf.gz
++fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/jfbterm/8x13-ISO8859-15.pcf.gz
+fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz
-+fontset: iso10646.1,pcf,U,/usr/X11R6/lib/X11/fonts/misc/unifont.pcf.gz
++fontset: iso10646.1,pcf,U,/usr/share/fonts/jfbterm/b16.pcf.gz
###############################################################################
jfbterm-0.4.7-configure-header.patch:
--- NEW FILE jfbterm-0.4.7-configure-header.patch ---
--- jfbterm-0.4.7/configure.in.orig 2005-02-25 00:01:05.000000000 +0900
+++ jfbterm-0.4.7/configure.in 2006-07-25 21:02:41.000000000 +0900
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(fbcommon.c)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(jfbterm, 0.4.7)
dnl Checks for programs.
jfbterm-0.4.7-hang-onexit.patch:
--- NEW FILE jfbterm-0.4.7-hang-onexit.patch ---
--- jfbterm-0.4.7/term.c.hang 2006-07-27 17:19:12.000000000 +0900
+++ jfbterm-0.4.7/term.c 2006-07-28 01:01:42.000000000 +0900
@@ -77,6 +77,30 @@
int st;
int ret;
ret = wait(&st);
+
+ /* ???
+ Comment by Mamoru Tasaka. Jul 28 2006
+
+ Some race condition occurring??
+ In some case, this sigchild wait(2) the process with
+ id gChildProcessId + 1 and leave gChildProcessId a ZOMBIE
+ process.
+
+ In this case jfbterm never returns from tterm_start
+ and hangs eternally.
+
+ WORKARROND:
+ */
+ if (gChildProcessId && (ret != ECHILD)
+ && (ret != gChildProcessId)){
+ /* Well... It seems that this routine is sometimes called.
+ I don't know why, however, if there is a case, this is
+ necessary.
+ */
+ int status;
+ ret = waitpid(gChildProcessId, &status, WNOHANG|WUNTRACED);
+ }
+
if (ret == gChildProcessId || ret == ECHILD) {
tvterm_unregister_signal();
tterm_final(&gTerm);
jfbterm-0.4.7-infinite_loop.patch:
--- NEW FILE jfbterm-0.4.7-infinite_loop.patch ---
==============================================
jfbterm (0.4.7-2) unstable; urgency=high
* fix screen lock problem on d-i 2nd stage
reported by Kenshi Muto <kmuto at debian.org>
==============================================
--- jfbterm-0.4.7.orig/ChangeLog
+++ jfbterm-0.4.7/ChangeLog
@@ -1,8 +1,14 @@
-2005-02-24 ukai <ukai at debian.or.jp>
+2005-03-12 Fumitoshi UKAI <ukai at debian.or.jp>
+
+ * fix some lockup problem, reported by Kenshi Muto
+ * main.c (tapp_init): SIGCHLD to wait for gunzip processes.
+ * term.h (sigchld): used in main.c:tapp_init
+
+2005-02-24 Fumitoshi UKAI <ukai at debian.or.jp>
* version 0.4.7 released
-2005-02-24 ukai <ukai at debian.or.jp>
+2005-02-24 Fumitoshi UKAI <ukai at debian.or.jp>
* font.c (font_open): dont use popen(3) to fix local exploit.
--- jfbterm-0.4.7.orig/main.c
+++ jfbterm-0.4.7/main.c
@@ -184,7 +184,7 @@
p->gExecShellArgv = NULL;
p->gConfFile = FILE_JFBTERM_CONF;
p->gConfEncoding = NULL;
-
+ signal(SIGCHLD, sigchld);
atexit(tapp_final_at_exit);
}
--- jfbterm-0.4.7.orig/term.h
+++ jfbterm-0.4.7/term.h
@@ -44,7 +44,7 @@
} TTerm;
void tterm_start(TTerm* p, const char* tn, const char* en);
-
+void sigchld(int sig);
extern TTerm gTerm;
#endif /* INCLUDE_TERM_H */
jfbterm-0.4.7-mmap-newkernel.patch:
--- NEW FILE jfbterm-0.4.7-mmap-newkernel.patch ---
--- jfbterm-0.4.7/fbcommon.c.mmap 2006-07-27 17:19:12.000000000 +0900
+++ jfbterm-0.4.7/fbcommon.c 2006-07-27 20:32:21.000000000 +0900
@@ -564,21 +564,34 @@
p->moff = (u_long)(fb_fix.mmio_start) & (~PAGE_MASK);
p->mlen = (fb_fix.mmio_len + p->moff + ~PAGE_MASK) & PAGE_MASK;
+
+#if 0 /* This code is dead... perhaps? */
p->mmio = (u_char*)mmap(NULL, p->mlen, PROT_READ|PROT_WRITE,
MAP_SHARED, p->fh, p->slen);
if ((long)p->mmio == -1) {
+ /* mmap with length 0 returns EINVAL on > linux 2.6.12 */
+ if (!p->mlen){
+ if (p->moff) {
+ print_message("possible memory corruption\n");
+ abort();
+ }
+ } else {
#ifdef JFB_MMIO_CHECK
die("cannot mmap(mmio)");
#else
print_message("cannot mmap(mmio) : %s\n", strerror(errno));
#endif
+ }
}
p->mmio = p->mmio + p->moff;
+#endif
#ifdef DEBUG
print_message("mmap ; %d - %p\n", p->slen, p->smem);
+#if 0
print_message("mmio ; %d - %p\n", p->mlen, p->mmio);
#endif
+#endif
/* move viewport to upper left corner */
if (fb_var.xoffset != 0 || fb_var.yoffset != 0) {
@@ -610,9 +623,11 @@
if ((long)p->smem != -1) {
munmap((caddr_t)((u_long)p->smem & PAGE_MASK), p->slen);
}
+#if 0
if ((long)p->mmio != -1) {
munmap((caddr_t)((u_long)p->mmio & PAGE_MASK), p->mlen);
}
+#endif
if (cmapSaved == TRUE) {
tfbm_put_cmap(p->fh, &ocmap);
cmapSaved = FALSE;
jfbterm-0.4.7-remove-sticky.patch:
--- NEW FILE jfbterm-0.4.7-remove-sticky.patch ---
--- jfbterm-0.4.7/Makefile.in.sticky 2003-09-14 05:58:53.000000000 +0900
+++ jfbterm-0.4.7/Makefile.in 2006-08-11 01:23:37.000000000 +0900
@@ -402,8 +402,8 @@
install-exec-hook:
- chown root:utmp $(DESTDIR)$(bindir)/jfbterm
- chmod ug+s $(DESTDIR)$(bindir)/jfbterm
+ : chown root:utmp $(DESTDIR)$(bindir)/jfbterm
+ : chmod ug+s $(DESTDIR)$(bindir)/jfbterm
install-data-local:
$(INSTALL_DATA) $(srcdir)/$(JFBTERM_CONFIG_FILE) $(DESTDIR)$(sysconfdir)/$(JFBTERM_CONFIG_FILE)
jfbterm-0.4.7-remove-warning.patch:
--- NEW FILE jfbterm-0.4.7-remove-warning.patch ---
--- jfbterm-0.4.7/fbcommon.c.compile 2003-09-03 00:23:17.000000000 +0900
+++ jfbterm-0.4.7/fbcommon.c 2006-07-26 16:29:11.000000000 +0900
@@ -560,7 +560,7 @@
if ((long)p->smem == -1) {
die("cannot mmap(smem)");
}
- p->smem = (char *)p->smem + p->soff;
+ p->smem = p->smem + p->soff;
p->moff = (u_long)(fb_fix.mmio_start) & (~PAGE_MASK);
p->mlen = (fb_fix.mmio_len + p->moff + ~PAGE_MASK) & PAGE_MASK;
@@ -573,7 +573,7 @@
print_message("cannot mmap(mmio) : %s\n", strerror(errno));
#endif
}
- p->mmio = (char *)p->mmio + p->moff;
+ p->mmio = p->mmio + p->moff;
#ifdef DEBUG
print_message("mmap ; %d - %p\n", p->slen, p->smem);
--- jfbterm-0.4.7/fbdpsp.c.compile 2006-07-26 15:44:25.000000000 +0900
+++ jfbterm-0.4.7/fbdpsp.c 2006-07-26 16:01:45.000000000 +0900
@@ -837,7 +837,7 @@
#define GRAPHICS_MODE_INDEX 5 /* Graphics Mode Register index. */
#define BIT_MASK_INDEX 8 /* Bit Mask Register index. */
-static inline void rmw(volatile char *p)
+static inline void rmw(volatile unsigned char *p)
{
*p |= 1;
}
--- jfbterm-0.4.7/pcf.c.compile 2003-09-16 00:45:31.000000000 +0900
+++ jfbterm-0.4.7/pcf.c 2006-07-26 16:17:16.000000000 +0900
@@ -212,9 +212,20 @@
}
/*---------------------------------------------------------------------------*/
+#if 0
static u_int to_u32l(u_char* p)
{
return p[0]+(p[1]<<8)+(p[2]<<16)+(p[3]<<24);
+#else
+static u_int to_u32l(char* p)
+{
+ /*signness fix */
+ u_int i, j = 0;
+ for (i = 0; i < 4; i++){
+ j += ((u_char) p[i]) << (i * 8);
+ }
+ return j;
+#endif
}
/*---------------------------------------------------------------------------*/
@@ -288,7 +299,7 @@
read_u8(fp);
}
p->nSlen = read_s32(fp, p->e);
- if (!(p->strings = (u_char*)malloc(sizeof(u_char)*p->nSlen))) {
+ if (!(p->strings = (char*)malloc(sizeof(u_char)*p->nSlen))) {
die("(FONT): malloc error\n");
}
if (fread(p->strings, p->nSlen, 1, fp) != 1) die_file_eof(fp);
@@ -535,7 +546,7 @@
p->defa = read_s16(fp, fmt.obit);
r = (p->coll - p->colf +1) * (p->rowl - p->rowf +1);
- if (!(p->table = (u_int*)malloc(sizeof(int) * r))) {
+ if (!(p->table = (int*)malloc(sizeof(int) * r))) {
die("(FONT): malloc error\n");
}
for (i = 0 ; i < r ; i++) {
--- jfbterm-0.4.7/term.c.compile 2003-09-16 00:45:31.000000000 +0900
+++ jfbterm-0.4.7/term.c 2006-07-26 16:56:31.000000000 +0900
@@ -134,7 +134,7 @@
int ret;
struct timeval tv;
- u_char buf[BUF_SIZE+1];
+ char buf[BUF_SIZE+1];
#ifdef JFB_ENABLE_DIMMER
u_int idle_time = 0;
u_int blank = 0;
@@ -216,7 +216,8 @@
}
#endif
if (ret > 0) {
- write(p->ptyfd, buf, ret);
+ int j = write(p->ptyfd, buf, ret);
+ j = 0;
}
} else if (FD_ISSET(p->ptyfd,&fds)) {
ret = read(p->ptyfd, buf, BUF_SIZE);
--- jfbterm-0.4.7/vterm.c.compile 2004-05-11 03:08:47.000000000 +0900
+++ jfbterm-0.4.7/vterm.c 2006-07-26 16:22:04.000000000 +0900
@@ -1107,6 +1107,7 @@
static void tvterm_esc_report(TVterm* p, u_char mode, u_short arg)
{
+ int j;
p->report[0] = '\0';
switch(mode) {
@@ -1125,7 +1126,8 @@
}
break;
}
- write(p->term->ptyfd, p->report, strlen(p->report));
+ j = write(p->term->ptyfd, p->report, strlen(p->report));
+ j = 0;
}
static void tvterm_set_region(TVterm* p,int ymin, int ymax)
@@ -1355,7 +1357,7 @@
static void
tvterm_esc_rbracket(TVterm* p, u_char ch)
{
- static u_char arg[MAX_ARGLEN+1], enbuf[MAX_ARGLEN+32];
+ static char arg[MAX_ARGLEN+1], enbuf[MAX_ARGLEN+32];
static int argidx;
if (ch >= 0x20 && ch <= 0x7e) {
--- jfbterm-0.4.7/vtermlow.c.compile 2003-09-30 00:45:33.000000000 +0900
+++ jfbterm-0.4.7/vtermlow.c 2006-07-26 16:27:30.000000000 +0900
@@ -591,7 +591,9 @@
}
}
-void tvterm_text_reverse(TVterm* p,int fx, int fy, int tx, int ty)
+#if 0 /* DEAD CODE */
+void tvterm_text_reverse(TVterm* p,u_int fx, u_int fy,
+ u_int tx, u_int ty)
{
u_int from, to, y, swp, xx, x;
u_char fc, bc, fc2, bc2;
@@ -629,6 +631,7 @@
fx = 0;
}
}
+#endif
#if 0
/* Cursor related routines. */
jfbterm-0.4.7-userspace.patch:
--- NEW FILE jfbterm-0.4.7-userspace.patch ---
--- jfbterm-0.4.7/fbdpsp.c.userspace 2003-08-30 03:48:16.000000000 +0900
+++ jfbterm-0.4.7/fbdpsp.c 2006-07-25 21:13:20.000000000 +0900
@@ -827,8 +827,7 @@
#ifdef JFB_VGA16FB
-#include <asm/io.h>
-#include <asm/system.h>
+#include <sys/io.h>
#define GRAPHICS_ADDR_REG 0x3ce /* Graphics address register. */
#define GRAPHICS_DATA_REG 0x3cf /* Graphics data register. */
--- NEW FILE jfbterm.spec ---
Summary: Japanese Console for Linux Frame Buffer Device
Name: jfbterm
Version: 0.4.7
Release: 6%{?dist}
License: BSD
Group: Applications/System
Source0: http://downloads.sourceforge.jp/jfbterm/13501/jfbterm-%{version}.tar.gz
Patch0: jfbterm-0.4.6-conf.patch
#Patch1: jfbterm-0.4.6-Makefile.patch
Patch1: jfbterm-0.4.7-remove-sticky.patch
#Patch2: jfbterm-0.4.6-x86_64.patch
Patch3: jfbterm-0.4.7-infinite_loop.patch
Patch4: jfbterm-0.4.7-configure-header.patch
Patch5: jfbterm-0.4.7-userspace.patch
Patch10: jfbterm-0.4.7-remove-warning.patch
Patch11: jfbterm-0.4.7-mmap-newkernel.patch
Patch12: jfbterm-0.4.7-hang-onexit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
URL: http://jfbterm.sourceforge.jp/
BuildRequires: gzip
BuildRequires: autoconf
# for tic
BuildRequires: ncurses
# Now efont-unicode-bdf is split.
BuildRequires: efont-unicode-bdf
BuildRequires: xorg-x11-fonts-base
BuildRequires: xorg-x11-fonts-misc
BuildRequires: fonts-japanese
# Now fonts are symlinks so really these rpms are required.
Requires: efont-unicode-bdf
Requires: xorg-x11-fonts-base
Requires: xorg-x11-fonts-misc
Requires: fonts-japanese
%description
JFBTERM/ME takes advantages of framebuffer device that is
supported since linux kernel 2.2.x (at least on ix86 architecture)
and make it enable to display multilingual text on console.
It is developed on ix86 architecture, and it will works on
other architectures such as linux/ppc.
Features:
* It works with framebuffer device instead of VGA.
* It supports pcf format font
* It is not so fast because it doesn't take any advantages
of accelaration.
* It also support coding systems other than ISO-2022,
such as SHIFT-JIS by using iconv(3).
* It is userland program.
%prep
%setup -q
%patch0 -p1 -b .conf
%patch1 -p1 -b .remove_sticky
%patch5 -p1 -b .userspace
%patch3 -p1 -b .infinite_loop
%patch4 -p1 -b .conf_header
%patch10 -p1 -b .remove_warn
%patch11 -p1 -b .nmap_newkernel
%patch12 -p1 -b .hang_onexit
%build
# Copy fonts for a moment.
cp -p %{_datadir}/fonts/japanese/efont-unicode-bdf/b16.pcf.gz fonts/
# why does this package call autoheader automatically??
touch Makefile.in configure aclocal.m4
%{__autoheader}
%configure --enable-direct-color
%{__make} %{?_smp_mflags}
tic -C terminfo.jfbterm > jfbterm.termcap
%install
%{__rm} -rf %{buildroot}
relative_ln(){
set +x
src=$1
target=$2
if [ -d $src ] ; then src=${src}/ ; fi
if [ -d $target ] ; then target=${target}/ ; fi
src=`echo $src | sed -e 's|//*|/|g'`
target=`echo $target | sed -e 's|//*|/|g'`
eval dist=\$\{target#%{buildroot}\}
unset dir1 dir2 dir
dir1=/
dir2=/
while [ x$dir1 = x$dir2 ] ; do
dir=$dir1
src=`echo $src | sed -e 's|^[^/]*/||'`
dist=`echo $dist | sed -e 's|^[^/]*/||'`
dir1="${dir1}`echo $src | sed -e 's|/.*$|/|'`"
dir2="${dir2}`echo $dist | sed -e 's|/.*$|/|'`"
done
dir_upward=`echo $dist | sed -e 's|[^/][^/]*/|../|g' | sed -e 's|[^/][^/]*$||'`
dir_upward=${dir_upward#/}
set -x
ln -sf ${dir_upward}${src} $target
}
%{__mkdir_p} %{buildroot}%{_sysconfdir}
%{__mkdir_p} %{buildroot}%{_datadir}/fonts/jfbterm
%{__make} DESTDIR=%{buildroot} install
%{__mv} %{buildroot}%{_sysconfdir}/jfbterm.conf.sample \
%{buildroot}%{_sysconfdir}/jfbterm.conf
%{__mkdir_p} %{buildroot}%{_mandir}/man1
%{__mkdir_p} %{buildroot}%{_mandir}/man5
%{__install} -m 644 jfbterm.1 %{buildroot}%{_mandir}/man1
%{__install} -m 644 jfbterm.conf.5 %{buildroot}%{_mandir}/man5
%{__mkdir_p} %{buildroot}%{_datadir}/terminfo/j
tic -o %{buildroot}%{_datadir}/terminfo terminfo.jfbterm
# install fonts by symlink
# for fc5 and above, X11R6 directory is no longer used.
%{__rm} -rf %{buildroot}%{_datadir}/fonts/jfbterm/*
relative_ln \
%{_datadir}/fonts/japanese/efont-unicode-bdf/b16.pcf.gz \
%{buildroot}%{_datadir}/fonts/jfbterm/
for font in \
shnm8x16r.pcf.gz shnmk16.pcf.gz jisksp16-1990.pcf.gz \
8x16.pcf.gz gb16fs.pcf.gz hanglg16.pcf.gz \
; do
status=1
for path in \
%{_datadir}/fonts/{japanese,ja}/misc \
%{_datadir}/X11/fonts/misc \
; do
if [ -f $path/$font -a $status = 1 ] ; then
relative_ln $path/$font %{buildroot}%{_datadir}/fonts/jfbterm/
status=0
break
fi
done
if [ $status = 1 ] ; then exit 1 ; fi
done
status=1
for num in `seq 1 15` ; do
font=8x13-ISO8859-${num}.pcf.gz
path=%{_datadir}/X11/fonts/misc
if [ -f $path/$font ] ; then
relative_ln $path/$font %{buildroot}%{_datadir}/fonts/jfbterm/
status=0
fi
done
if [ $status = 1 ] ; then exit 1 ; fi
%{__cat} > 60-jfbterm.perms <<EOF
# permission definitions
<console> 0660 /dev/tty0 0660 root
<console> 0600 /dev/console 0600 root
EOF
%{__mkdir_p} -m 755 %{buildroot}%{_sysconfdir}/security/console.perms.d
%{__install} -m 644 60-jfbterm.perms \
%{buildroot}%{_sysconfdir}/security/console.perms.d/
# Change documents' fonts to UTF-8
%{__sed} -i -e 's|\r||' AUTHORS
for f in AUTHORS ChangeLog ; do
%{__mv} ${f} ${f}.orig
iconv -f ISO-2022-JP -t UTF8 ${f}.orig > ${f} && \
%{__rm} -f ${f}.orig || %{__mv} ${f}.orig ${f}
done
%{__mv} README.ja README.ja.orig
iconv -f EUCJP -t UTF8 README.ja.orig > README.ja && \
%{__rm} -f README.ja.orig || %{__mv} README.ja.orig README.ja
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README*
%doc jfbterm.termcap
%{_bindir}/jfbterm
%config(noreplace) %{_sysconfdir}/jfbterm.conf
%config(noreplace) %{_sysconfdir}/security/console.perms.d/60-jfbterm.perms
%{_datadir}/fonts/jfbterm
%{_mandir}/man1/jfbterm.1*
%{_mandir}/man5/jfbterm.conf.5*
%{_datadir}/terminfo/j/jfbterm
%ChangeLog
* Sun Aug 20 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-6
- Really require fonts as they are symlinks.
* Sun Aug 20 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-5
- Install fonts required by relative symlinks.
* Thu Aug 15 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-4
- Change the font search path.
* Thu Aug 10 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-3
- Another attempt to remove sticky bit.
- Move the entry where we copy fonts needed.
* Thu Aug 10 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-2
- Fix man page entry.
* Thu Aug 10 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-1
- Strict dist to fc5 and above.
- Split efont-unicode-bdf to another rpm.
* Tue Aug 1 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-0.15
- Clean up spec file and make some cosmetic change.
- Specify the correct licence.
* Tue Jul 25 2006 MACHIDA Hideki <h-machida at jc-c.co.jp> 0.4.7-0.9.1
- FIX: fc1 - fc3 font pathes.
- add console.perms file for not use sticky bit (fc4 or later).
* Tue Jul 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-0.9
- Remove gcc compilation warning.
- Suppress mmap warning for linux >= 2.6.12 (this code is dead, perhaps?)
- Workarround for occasional hang on exit.
- Change Japanese documents coding to UTF-8.
* Tue Jul 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-0.1
- Initial package for fc6 and fc5, based on srpm by Hideki Machida, initially
by momonga linux project.
* Fri Mar 24 2006 MACHIDA Hideki <h at matchy.net> 0.4.7-matchy4
- for FedoraCore-5
* Tue Jun 14 2005 MACHIDA Hideki <h at matchy.net> 0.4.7-matchy3
- for FedoraCore-4
* Wed May 18 2005 MACHIDA Hideki <h at matchy.net> 0.4.7-matchy2
- add jfbterm-0.4.6-x86_64.patch and jfbterm-0.4.7-infinite_loop.patch
- from 0.4.7-1m (momonga-linux).
* Thu Feb 25 2005 MACHIDA Hideki <h at matchy.net> 0.4.7-matchy1
- update to 0.4.7.
* Thu Jan 27 2005 MACHIDA Hideki <h at matchy.net> 0.4.6-matchy6
- for release.
* Wed Jan 19 2005 MACHIDA Hideki <h at matchy.net> 0.4.6-matchy5.2
- add BuildPreReq: automake14, autoconf.
* Wed Jan 19 2005 MACHIDA Hideki <h at matchy.net> 0.4.6-matchy5
- use %%dist macro.
* Wed Jan 19 2005 MACHIDA Hideki <h at matchy.net> 0.4.6-matchy4
- add BuildPreReqs jisksp16-1990.
* Fri Dec 31 2004 MACHIDA Hideki <h at matchy.net> 0.4.6-matchy3
- fix debug package (Makefile patch).
* Wed Dec 29 2004 MACHIDA Hideki <h at matchy.net> 0.4.6-matchy2
- fix Packager and ChangeLog (^-^;)
* Tue Dec 28 2004 MACHIDA Hideki <h at matchy.net> 0.4.6-matchy1
- for FedoraCore-3 (from momonga-linux)
- add efont-unicode
- use tic.
* Wed Dec 15 2004 TAKAHASHI Tamotsu <tamo>
- (0.4.6-1m)
* Tue Apr 6 2004 Toru Hoshina <t at momonga-linux.org>
- (0.4.3-2m)
- not enumerate all of font file name.
* Tue Sep 16 2003 Kazuhiko <kazuhiko at fdiary.net>
- (0.4.3-1m)
- bugfixes
* Mon Sep 15 2003 Kazuhiko <kazuhiko at fdiary.net>
- (0.4.2-1m)
- include font files
* Thu May 29 2003 Shingo Akagaki <droa at kitty.dnsalias.org>
- (0.3.12-1m)
- version 0.3.12
* Fri Feb 15 2002 Tsutomu Yasuda <tom at kondara.org>
- (0.3.10-20k)
- update Source0 URL
* Tue May 22 2001 Toru Hoshina <toru at df-usa.com>
- (0.3.10-18k)
* Tue May 8 2001 MATSUDA, Daiki <dyky at df-usa.com>
- (0.3.10-16k)
- add termcap to PreReq tag
* Sun May 6 2001 MATSUDA, Daiki <dyky at df-usa.com>
- (0.3.10-14k)
- add PreReq tag for %post section
* Tue Apr 17 2001 Tsutomu Yasuda <tom at digitalfactory.co.jp>
- applied gcc296 patch
* Sun Apr 15 2001 Toru Hoshina <toru at df-usa.com>
- revised spec file.
- add ppc support.
* Fri Oct 20 2000 Toru Hoshina <toru at df-usa.com>
- *Req*:tag never use ABS path
* Wed Jul 05 2000 Toru Hoshina <t at kondara.org>
- rebuild against glibc-2.1.90, X-4.0, rpm-3.0.5.
* Tue Apr 25 2000 Kenzi Cano <kc at furukawa.ch.kagu.sut.ac.jp>
- up to 0.3.10
* Wed Dec 01 1999 Motonobu Ichimura <famao at kondara.org>
- up to 0.3.7
* Wed Nov 17 1999 Motonobu Ichimura <famao at kondara.org>
- up to 0.2.3
* Fri Nov 12 1999 Motonobu Ichimura <famao at kondara.org>
- up to 0.2.2
* Mon Nov 08 1999 Toru Hoshina <t at kondara.org>
- be a NoSrc :-P
* Sat Oct 23 1999 Motonobu Ichimura <famao at kondara.org>
- removed termcap and some changes added.
- not use terminfo.kon but terminfo.jfbterm
* Sat Oct 02 1999 Motonobu Ichimura <g95j0116 at mn.waseda.ac.jp>
- first release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jfbterm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 21 Aug 2006 02:15:16 -0000 1.1
+++ .cvsignore 21 Aug 2006 02:16:09 -0000 1.2
@@ -0,0 +1 @@
+jfbterm-0.4.7.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jfbterm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 21 Aug 2006 02:15:16 -0000 1.1
+++ sources 21 Aug 2006 02:16:09 -0000 1.2
@@ -0,0 +1 @@
+cb0b869bd1c21f0dd224b7fc40517680 jfbterm-0.4.7.tar.gz
More information about the fedora-extras-commits
mailing list