Hello community, here is the log from the commit of package xli checked in at Thu Jul 27 18:16:32 CEST 2006. -------- --- xli/xli.changes 2006-07-22 20:20:36.000000000 +0200 +++ xli/xli.changes 2006-07-27 16:32:25.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 27 16:28:51 CEST 2006 - lmichnovic@suse.cz + +- building with X.org 7.x: detects version of X.org instead of + suse_version + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xli.spec ++++++ --- /var/tmp/diff_new_pack.B6BguZ/_old 2006-07-27 18:16:09.000000000 +0200 +++ /var/tmp/diff_new_pack.B6BguZ/_new 2006-07-27 18:16:09.000000000 +0200 @@ -17,7 +17,7 @@ Provides: xli115 Autoreqprov: on Version: 20050904 -Release: 16 +Release: 17 Summary: X11 Image Loading Utility URL: http://pantransit.reptiles.org/prog Source: xli-1.17.0-%{version}.tar.bz2 @@ -26,30 +26,32 @@ Patch2: xli-1.17.0-8bit_palette.patch Patch3: xli-1.17.0-configfile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} <= 1010 -%define _xorg7libs X11R6/%_lib -%define _xorg7libs32 X11R6/lib -%define _xorg7bin X11R6/bin -%define _xorg7mandir /usr/X11R6/man -%define _xorg7pixmaps X11R6/include -%define _xorg7libshare X11R6/lib/ -%define _xorg7xkb /etc/X11/xkb -%define _xorg7termcap /usr/X11R6/lib/X11/etc -%define _xorg7include /usr/X11R6/lib/Server/include -%define _xorg7fonts /usr/X11R6/lib/X11/fonts -%define _xorg7prefix /usr/X11R6 -%else +%if "%(xft-config --prefix)" == "/usr" %define _xorg7libs %_lib %define _xorg7libs32 lib %define _xorg7bin bin -%define _xorg7mandir %_mandir +%define _xorg7_mandir %_mandir %define _xorg7pixmaps include %define _xorg7libshare share -%define _xorg7xkb /usr/share/X11/xkb -%define _xorg7termcap /usr/lib/X11/etc -%define _xorg7include /usr/include/xorg -%define _xorg7fonts /usr/share/fonts -%define _xorg7prefix /usr +%define _xorg7_xkb /usr/share/X11/xkb +%define _xorg7_termcap /usr/lib/X11/etc +%define _xorg7_serverincl /usr/include/xorg +%define _xorg7_fonts /usr/share/fonts +#%define _xorg7_config /usr/share/X11/config #use libshare macro +%define _xorg7_prefix /usr +%else +%define _xorg7libs X11R6/%_lib +%define _xorg7libs32 X11R6/lib +%define _xorg7bin X11R6/bin +%define _xorg7_mandir /usr/X11R6/man +%define _xorg7pixmaps X11R6/include +%define _xorg7libshare X11R6/lib/ +%define _xorg7_xkb /etc/X11/xkb +%define _xorg7_termcap /usr/X11R6/lib/X11/etc +%define _xorg7_serverincl /usr/X11R6/lib/Server/include +%define _xorg7_fonts /usr/X11R6/lib/X11/fonts +#%define _xorg7_config /usr/X11R6/lib/X11/config #use libshare macro +%define _xorg7_prefix /usr/X11R6 %endif %description @@ -86,8 +88,8 @@ %files %doc README* ABOUTGAMMA -%doc %{_xorg7mandir}/man1/xli.1x.gz -%doc %{_xorg7mandir}/man1/xlito.1x.gz +%doc %{_xorg7_mandir}/man1/xli.1x.gz +%doc %{_xorg7_mandir}/man1/xlito.1x.gz /usr/%{_xorg7bin}/xli /usr/%{_xorg7bin}/xlito /usr/%{_xorg7bin}/xsetbg @@ -95,6 +97,9 @@ /usr/lib/X11/Xli %changelog -n xli +* Thu Jul 27 2006 - lmichnovic@suse.cz +- building with X.org 7.x: detects version of X.org instead of + suse_version * Sat Jul 22 2006 - lmichnovic@suse.cz - create config file in /usr/lib/X11/Xli as sugested in man page (configfile.patch) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org