commit kterm

6 Aug 2006

Hello community,

here is the log from the commit of package kterm
checked in at Sun Aug 6 21:53:47 CEST 2006.

--------

--- kterm/kterm.changes	2006-01-25 21:37:16.000000000 +0100
+++ kterm/kterm.changes	2006-08-04 19:19:48.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Aug 04 18:44:30 CEST 2006 - mfabian@suse.de
+
+- adapt for Xorg X11R7 (paths changed).
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kterm.spec ++++++
--- /var/tmp/diff_new_pack.qeLQzU/_old	2006-08-06 21:53:41.000000000 +0200
+++ /var/tmp/diff_new_pack.qeLQzU/_new	2006-08-06 21:53:41.000000000 +0200
@@ -1,20 +1,33 @@
 #
 # spec file for package kterm (Version 6.2.0)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
 Name:         kterm
+%if %suse_version > 910
 BuildRequires: utempter xorg-x11 xorg-x11-devel
+%else
+BuildRequires:  XFree86 XFree86-devel utempter
+%endif
+%if "%(xft-config --prefix)" == "/usr"
+%define	appdefdir  /usr/share/X11
+%define mymandir   /usr/share/man
+%define mybindir   /usr/bin
+%else
+%define	appdefdir  /usr/X11R6/lib/X11
+%define mymandir   /usr/X11R6/man
+%define mybindir   /usr/X11R6/bin
+%endif
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Version:      6.2.0
-Release:      806
+Release:        819
 License:      X11/MIT, BSD
 Group:        System/X11/Terminals
 Prereq:       /bin/ln
@@ -45,11 +58,11 @@
 Patch13:      null-pointer.patch
 
 %description
-Kterm  is  a  multilingual  terminal  emulator	based  on xterm.   The 
-major ways kterm differs from xterm are that it can handle multilingual
-text encoded in  ISO2022, can display colored text, and has the status
-line function. To input multilingual text, both the X  Input  Method 
-(XIM) protocol	and  kinput2 protocol can be used.
+Kterm is a multilingual terminal emulator based on xterm. The major
+ways kterm differs from xterm are that it can handle multilingual text
+encoded in ISO2022, can display colored text, and has the status line
+function. To input multilingual text, both the X Input Method (XIM)
+protocol and kinput2 protocol can be used.
 
 
 
@@ -87,14 +100,14 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
 make install DESTDIR=$RPM_BUILD_ROOT
 make install.man MANSUFFIX=1 LIBMANSUFFIX=3 DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/{ja,ja_JP.SJIS}/app-defaults/
-install -m444 KTerm-ja.ad $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja/app-defaults/KTerm
+mkdir -p $RPM_BUILD_ROOT%{appdefdir}/{ja,ja_JP.SJIS}/app-defaults/
+install -m444 KTerm-ja.ad $RPM_BUILD_ROOT%{appdefdir}/ja/app-defaults/KTerm
 iconv -f EUC-JP -t SJIS KTerm-ja.ad > KTerm-ja.ad.SJIS
 LC_ALL=C perl -pi -e 's/^(\*VT100\*kanjiMode:\s+)euc/\1sjis/' KTerm-ja.ad.SJIS
-install -m444 KTerm-ja.ad.SJIS $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP.SJIS/app-defaults/KTerm
-install -d -m755 $RPM_BUILD_ROOT/usr/X11R6/man/ja/man1
+install -m444 KTerm-ja.ad.SJIS $RPM_BUILD_ROOT%{appdefdir}/ja_JP.SJIS/app-defaults/KTerm
+install -d -m755 $RPM_BUILD_ROOT%{mymandir}/ja/man1
 iconv -f iso-2022-jp -t euc-jp kterm.jman > kterm.1
-install -m444 kterm.1 $RPM_BUILD_ROOT/usr/X11R6/man/ja/man1/kterm.1
+install -m444 kterm.1 $RPM_BUILD_ROOT%{mymandir}/ja/man1/kterm.1
 
 %post
 # 
@@ -111,14 +124,14 @@
 # As a temporary workaround I just create symbolic links here, if
 # such directories don't exist:
 # 
-if [ ! -e /usr/X11R6/lib/X11/japanese ] ; then
-    ln -s /usr/X11R6/lib/X11/ja /usr/X11R6/lib/X11/japanese
+if [ ! -e %{appdefdir}/japanese ] ; then
+    ln -s %{appdefdir}/ja %{appdefdir}/japanese
 fi
-if [ ! -e /usr/X11R6/lib/X11/japanese.euc ] ; then
-    ln -s /usr/X11R6/lib/X11/ja /usr/X11R6/lib/X11/japanese.euc
+if [ ! -e %{appdefdir}/japanese.euc ] ; then
+    ln -s %{appdefdir}/ja %{appdefdir}/japanese.euc
 fi
-if [ ! -e /usr/X11R6/lib/X11/japanese.sjis ] ; then
-    ln -s /usr/X11R6/lib/X11/ja_JP.SJIS /usr/X11R6/lib/X11/japanese.sjis
+if [ ! -e %{appdefdir}/japanese.sjis ] ; then
+    ln -s %{appdefdir}/ja_JP.SJIS %{appdefdir}/japanese.sjis
 fi
 
 %clean
@@ -127,20 +140,22 @@
 %files
 %defattr(-,root,root)
 %doc README.kt DEMO.kt.uu DEMO.xbm kterm.termcap kterm.terminfo
-%attr(755,root,root)/usr/X11R6/bin/kterm
-/usr/X11R6/lib/X11/app-defaults/KTerm
-/usr/X11R6/man/man1/kterm.1*
-%dir /usr/X11R6/lib/X11/ja/
-%dir /usr/X11R6/lib/X11/ja/app-defaults/
-/usr/X11R6/lib/X11/ja/app-defaults/KTerm
-%dir /usr/X11R6/lib/X11/ja_JP.SJIS/
-%dir /usr/X11R6/lib/X11/ja_JP.SJIS/app-defaults/
-/usr/X11R6/lib/X11/ja_JP.SJIS/app-defaults/KTerm
-%dir /usr/X11R6/man/ja/
-%dir /usr/X11R6/man/ja/man1/
-/usr/X11R6/man/ja/man1/kterm.1*
+%attr(755,root,root) %{mybindir}/kterm
+%{appdefdir}/app-defaults/KTerm
+%{mymandir}/man1/kterm.1*
+%dir %{appdefdir}/ja/
+%dir %{appdefdir}/ja/app-defaults/
+%{appdefdir}/ja/app-defaults/KTerm
+%dir %{appdefdir}/ja_JP.SJIS/
+%dir %{appdefdir}/ja_JP.SJIS/app-defaults/
+%{appdefdir}/ja_JP.SJIS/app-defaults/KTerm
+%dir %{mymandir}/ja/
+%dir %{mymandir}/ja/man1/
+%{mymandir}/ja/man1/kterm.1*
 
 %changelog -n kterm
+* Fri Aug 04 2006 - mfabian@suse.de
+- adapt for Xorg X11R7 (paths changed).
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Wed Jun 15 2005 - meissner@suse.de





++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

commit kterm

root＠suse.de