commit xiterm

6 Aug 2006

Hello community,

here is the log from the commit of package xiterm
checked in at Sun Aug 6 22:20:25 CEST 2006.

--------

--- xiterm/xiterm.changes	2006-02-28 17:13:22.000000000 +0100
+++ xiterm/xiterm.changes	2006-08-04 19:21:07.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Aug 04 19:20:58 CEST 2006 - mfabian@suse.de
+
+- adapt for Xorg X11R7 (paths changed).
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ xiterm.spec ++++++
--- /var/tmp/diff_new_pack.WOphjk/_old	2006-08-06 22:20:18.000000000 +0200
+++ /var/tmp/diff_new_pack.WOphjk/_new	2006-08-06 22:20:18.000000000 +0200
@@ -10,13 +10,26 @@
 
 
 Name:           xiterm
-BuildRequires:  fribidi-devel gtk2-devel update-desktop-files utempter xorg-x11
+%if %suse_version > 910
+BuildRequires:  fribidi-devel gtk2-devel update-desktop-files utempter xorg-x11 xorg-x11-devel
+%else
+BuildRequires:  XFree86 XFree86-devel fribidi-devel gtk2-devel update-desktop-files utempter
+%endif
+%if "%(xft-config --prefix)" == "/usr"
+%define	appdefdir  /usr/share/X11
+%define xincludes  /usr/include
+%define xlibraries /usr/%{_lib}
+%else
+%define	appdefdir  /usr/X11R6/lib/X11
+%define xincludes  /usr/X11R6/include
+%define xlibraries /usr/X11R6/%{_lib}
+%endif
 License:        IBM Public License, Other License(s), see package
 Group:          System/X11/Terminals
 Autoreqprov:    on
 Provides:       locale(xorg-x11:ja;ko;zh)
 Version:        0.5.20040304
-Release:        31
+Release:        41
 # cvs -d:pserver:anonymous@www.openi18n.org:/cvsroot login (no password to login)
 # cvs -d:pserver:anonymous@www.openi18n.org:/cvsroot co iterm
 # tar jcvf iterm-0.5.20040304.tar.bz2 iterm
@@ -154,6 +167,8 @@
 		--libdir=%{_libdir} \
 		--mandir=%{_mandir} \
 		--infodir=%{_infodir} \
+		--x-includes=%{xincludes} \
+		--x-libraries=%{xlibraries} \
 		--with-utempter \
 		--enable-fribidi \
 		%{_target_cpu}-suse-linux
@@ -167,6 +182,8 @@
 		--libdir=%{_libdir} \
 		--mandir=%{_mandir} \
 		--infodir=%{_infodir} \
+		--x-includes=%{xincludes} \
+		--x-libraries=%{xlibraries} \
 		%{_target_cpu}-suse-linux
     make  'INCLUDES=-I../../../lib/include -I../lib'
 popd
@@ -178,6 +195,8 @@
 		--libdir=%{_libdir} \
 		--mandir=%{_mandir} \
 		--infodir=%{_infodir} \
+		--x-includes=%{xincludes} \
+		--x-libraries=%{xlibraries} \
 		%{_target_cpu}-suse-linux
     make 'INCLUDES=-I../../../lib/include -I../lib' 'LDFLAGS=-L../../../lib/src/.libs -L../lib/.libs'
 popd
@@ -190,6 +209,8 @@
 		--libdir=%{_libdir} \
 		--mandir=%{_mandir} \
 		--infodir=%{_infodir} \
+		--x-includes=%{xincludes} \
+		--x-libraries=%{xlibraries} \
 		%{_target_cpu}-suse-linux
     make 'INCLUDES=-I../../../lib/include' \
          'LDFLAGS=-L../../../lib/src/.libs'
@@ -218,11 +239,11 @@
 # install terminfo entry-description
 mkdir -p $RPM_BUILD_ROOT/usr/share/terminfo/i
 tic -o $RPM_BUILD_ROOT/usr/share/terminfo/ unix/terminfo/iterm.terminfo
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/{ja,ja_JP.UTF-8,}/app-defaults
-install -m 644 unix/Xaw/src/XIterm $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/XIterm
-install -m 644 unix/Xaw/src/XIterm.ja $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja/app-defaults/XIterm
+mkdir -p $RPM_BUILD_ROOT%{appdefdir}/{ja,ja_JP.UTF-8,}/app-defaults
+install -m 644 unix/Xaw/src/XIterm $RPM_BUILD_ROOT%{appdefdir}/app-defaults/XIterm
+install -m 644 unix/Xaw/src/XIterm.ja $RPM_BUILD_ROOT%{appdefdir}/ja/app-defaults/XIterm
 iconv -f EUC-JP -t UTF-8 < unix/Xaw/src/XIterm.ja > unix/Xaw/src/XIterm.ja.UTF-8
-install -m 644 unix/Xaw/src/XIterm.ja.UTF-8 $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP.UTF-8/app-defaults/XIterm
+install -m 644 unix/Xaw/src/XIterm.ja.UTF-8 $RPM_BUILD_ROOT%{appdefdir}/ja_JP.UTF-8/app-defaults/XIterm
 # install fallback fonts for fbiterm:
 mkdir -p $RPM_BUILD_ROOT/usr/share/fbiterm/fonts
 pushd fonts
@@ -239,12 +260,12 @@
 %defattr(-, root, root)
 %doc unix/Xaw/README* unix/Xaw/src/{COPYING,ChangeLog,INSTALL*}
 %attr(555,root,tty) %{_bindir}/xiterm
-/usr/X11R6/lib/X11/app-defaults/*
-%dir /usr/X11R6/lib/X11/ja/
-%dir /usr/X11R6/lib/X11/ja/app-defaults/
-%dir /usr/X11R6/lib/X11/ja_JP.UTF-8/
-%dir /usr/X11R6/lib/X11/ja_JP.UTF-8/app-defaults/
-/usr/X11R6/lib/X11/*/app-defaults/*
+%{appdefdir}/app-defaults/*
+%dir %{appdefdir}/ja/
+%dir %{appdefdir}/ja/app-defaults/
+%dir %{appdefdir}/ja_JP.UTF-8/
+%dir %{appdefdir}/ja_JP.UTF-8/app-defaults/
+%{appdefdir}/*/app-defaults/*
 
 %files -n fbiterm
 %defattr(-, root, root)
@@ -284,6 +305,8 @@
 /usr/include/Iterm*.h
 
 %changelog -n xiterm
+* Fri Aug 04 2006 - mfabian@suse.de
+- adapt for Xorg X11R7 (paths changed).
 * Tue Feb 28 2006 - mfabian@suse.de
 - add "Provides: locale(...)".
 * Wed Jan 25 2006 - mls@suse.de


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



Remember to have fun...

    

commit xiterm

root＠suse.de