rpms/jfbterm/devel jfbterm-0.4.7-string_h-memmove.patch, NONE, 1.1 jfbterm.spec, 1.10, 1.11

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/jfbterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10359

Modified Files:
	jfbterm.spec 
Added Files:
	jfbterm-0.4.7-string_h-memmove.patch 
Log Message:
* Mon Dec  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-13
- Add BR: jisksp16-1990-fonts due to fonts-japanese split
- Workarround for bug 408731


jfbterm-0.4.7-string_h-memmove.patch:

--- NEW FILE jfbterm-0.4.7-string_h-memmove.patch ---
--- jfbterm-0.4.7/vtermlow.c.memmove	2007-12-07 01:38:16.000000000 +0900
+++ jfbterm-0.4.7/vtermlow.c	2007-12-07 01:51:10.000000000 +0900
@@ -33,7 +33,9 @@
 #define __USE_STRING_INLINES
 #include	<stdio.h>
 #include	<stdlib.h>
+#ifndef _FORTIFY_SOURCE
 #include	<string.h>
+#endif
 #include	<unistd.h>
 #include	<sys/vt.h>
 #include	<fcntl.h>


Index: jfbterm.spec
===================================================================
RCS file: /cvs/extras/rpms/jfbterm/devel/jfbterm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jfbterm.spec	22 Aug 2007 08:38:24 -0000	1.10
+++ jfbterm.spec	6 Dec 2007 17:01:24 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:   Japanese Console for Linux Frame Buffer Device
 Name:      jfbterm
 Version:   0.4.7
-Release:   12%{?dist}
+Release:   13%{?dist}
 License:   BSD
 Group:     Applications/System
 Source0:   http://downloads.sourceforge.jp/jfbterm/13501/jfbterm-%{version}.tar.gz
@@ -16,6 +16,7 @@
 Patch11:   jfbterm-0.4.7-mmap-newkernel.patch
 Patch12:   jfbterm-0.4.7-hang-onexit.patch
 Patch13:   jfbterm-0.4.7-pagemask_userspace.patch
+Patch14:   jfbterm-0.4.7-string_h-memmove.patch
 
 BuildRoot:   %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 URL:         http://jfbterm.sourceforge.jp/
@@ -29,6 +30,9 @@
 BuildRequires:   xorg-x11-fonts-base
 BuildRequires:   xorg-x11-fonts-misc
 BuildRequires:   fonts-japanese
+%if 0%{?fedora} >= 8
+BuildRequires:   jisksp16-1990-fonts
+%endif
 # Now fonts are symlinks so really these rpms are required.
 #Requires:   efont-unicode-bdf
 #Requires:   xorg-x11-fonts-base
@@ -62,6 +66,7 @@
 %patch11 -p1 -b .nmap_newkernel
 %patch12 -p1 -b .hang_onexit
 %patch13 -p1 -b .pagemask
+%patch14 -p1 -b .memmove
 
 %build
 # Copy fonts for a moment.
@@ -110,6 +115,7 @@
    status=1
    for path in \
       %{_datadir}/fonts/{japanese,ja}/misc \
+      %{_datadir}/fonts/jisksp16-1990-fonts \
       %{_datadir}/X11/fonts/misc \
        ; do
       if [ -f $path/$font -a $status = 1 ] ; then
@@ -177,6 +183,10 @@
 %endif
 
 %changelog
+* Mon Dec  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-13
+- Add BR: jisksp16-1990-fonts due to fonts-japanese split
+- Workarround for bug 408731
+
 * Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.7-12
 - Use sysconf instead of kernel-private PAGE_SIZE macro