Hello community, here is the log from the commit of package m17n-lib checked in at Mon Aug 14 17:42:35 CEST 2006. -------- --- m17n-lib/m17n-lib.changes 2006-06-20 12:27:48.000000000 +0200 +++ m17n-lib/m17n-lib.changes 2006-08-14 11:22:34.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 14 11:22:19 CEST 2006 - mfabian@suse.de + +- move app-defaults to /usr/share/X11 (for X11R7). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ m17n-lib.spec ++++++ --- /var/tmp/diff_new_pack.9rk9rp/_old 2006-08-14 17:42:12.000000000 +0200 +++ /var/tmp/diff_new_pack.9rk9rp/_new 2006-08-14 17:42:12.000000000 +0200 @@ -12,8 +12,13 @@ Name: m17n-lib BuildRequires: anthy-devel freetype2-devel fribidi-devel ispell ispell-british libotf-devel libxml2 m17n-db pkgconfig wordcut-devel xorg-x11-devel +%if "%(xft-config --prefix)" == "/usr" +%define appdefdir /usr/share/X11 +%else +%define appdefdir /usr/X11R6/lib/X11 +%endif Version: 1.3.3.20060620 -Release: 1 +Release: 2 License: LGPL, X11/MIT Group: System/I18n/Japanese Autoreqprov: on @@ -75,17 +80,17 @@ [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; make DESTDIR=${RPM_BUILD_ROOT} install # Japanese app-defaults: -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/{ja,ja_JP,ja_JP.eucJP,ja_JP.SJIS,ja_JP.UTF-8}/app-defaults +mkdir -p $RPM_BUILD_ROOT%{appdefdir}/{ja,ja_JP,ja_JP.eucJP,ja_JP.SJIS,ja_JP.UTF-8}/app-defaults iconv -f EUC-JP -t EUC-JP < example/M17NEdit.ja \ - > $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja/app-defaults/M17NEdit + > $RPM_BUILD_ROOT%{appdefdir}/ja/app-defaults/M17NEdit iconv -f EUC-JP -t EUC-JP < example/M17NEdit.ja \ - > $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP/app-defaults/M17NEdit + > $RPM_BUILD_ROOT%{appdefdir}/ja_JP/app-defaults/M17NEdit iconv -f EUC-JP -t EUC-JP < example/M17NEdit.ja \ - > $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP.eucJP/app-defaults/M17NEdit + > $RPM_BUILD_ROOT%{appdefdir}/ja_JP.eucJP/app-defaults/M17NEdit iconv -f EUC-JP -t SJIS < example/M17NEdit.ja \ - > $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP.SJIS/app-defaults/M17NEdit + > $RPM_BUILD_ROOT%{appdefdir}/ja_JP.SJIS/app-defaults/M17NEdit iconv -f EUC-JP -t UTF-8 < example/M17NEdit.ja \ - > $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP.UTF-8/app-defaults/M17NEdit + > $RPM_BUILD_ROOT%{appdefdir}/ja_JP.UTF-8/app-defaults/M17NEdit %clean #[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; @@ -96,10 +101,10 @@ %dir %{_libdir}/lib*.so.* %{_libdir}/lib*.so %{_bindir}/* -%dir /usr/X11R6/lib/X11/?? -%dir /usr/X11R6/lib/X11/??_* -%dir /usr/X11R6/lib/X11/*/app-defaults -%config /usr/X11R6/lib/X11/*/app-defaults/M17NEdit +%dir %{appdefdir}/?? +%dir %{appdefdir}/??_* +%dir %{appdefdir}/*/app-defaults +%config %{appdefdir}/*/app-defaults/M17NEdit %files devel %defattr(-, root, root) @@ -108,6 +113,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -n m17n-lib +* Mon Aug 14 2006 - mfabian@suse.de +- move app-defaults to /usr/share/X11 (for X11R7). * Tue Jun 20 2006 - mfabian@suse.de - update to 1.3.3.20060620: fixes bugzilla #185572 and some other small bugs. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org