rpms/jfbterm/devel jfbterm.spec,1.3,1.4

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	jfbterm.spec 
Log Message:
Remove X requirement


Index: jfbterm.spec
===================================================================
RCS file: /cvs/extras/rpms/jfbterm/devel/jfbterm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jfbterm.spec	28 Aug 2006 00:54:46 -0000	1.3
+++ jfbterm.spec	28 Aug 2006 04:31:04 -0000	1.4
@@ -30,10 +30,10 @@
 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
+#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 
@@ -79,38 +79,6 @@
 %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
 
@@ -129,9 +97,9 @@
 
 # install fonts by symlink
 # for fc5 and above, X11R6 directory is no longer used.
-%{__rm} -rf %{buildroot}%{_datadir}/fonts/jfbterm/*
+#%%{__rm} -rf %{buildroot}%{_datadir}/fonts/jfbterm/*
 
-relative_ln \
+cp -p \
    %{_datadir}/fonts/japanese/efont-unicode-bdf/b16.pcf.gz \
    %{buildroot}%{_datadir}/fonts/jfbterm/
 
@@ -145,7 +113,7 @@
       %{_datadir}/X11/fonts/misc \
        ; do
       if [ -f $path/$font -a $status = 1 ] ; then
-         relative_ln $path/$font %{buildroot}%{_datadir}/fonts/jfbterm/
+         cp -p $path/$font %{buildroot}%{_datadir}/fonts/jfbterm/
          status=0
          break
       fi
@@ -158,7 +126,7 @@
    font=8x13-ISO8859-${num}.pcf.gz
    path=%{_datadir}/X11/fonts/misc
    if [ -f $path/$font ] ; then
-    relative_ln $path/$font %{buildroot}%{_datadir}/fonts/jfbterm/
+    cp -p $path/$font %{buildroot}%{_datadir}/fonts/jfbterm/
     status=0
    fi
 done
@@ -202,6 +170,11 @@
 %{_datadir}/terminfo/j/jfbterm
 
 %ChangeLog
+* Mon Aug 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-9
+- Really copy font files, not use symlink to get rid of X requirement.
+  (This package is aimed for CUI use, so X requirement is
+   unwilling)
+
 * Mon Aug 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-8.1
 - Rebuild for mass rebuild and kernel-headers
   (glibc-kernheaders removed).