Hello community, here is the log from the commit of package xless checked in at Wed Aug 2 16:26:45 CEST 2006. -------- --- xless/xless.changes 2006-01-25 21:43:12.000000000 +0100 +++ xless/xless.changes 2006-08-02 16:01:39.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Aug 2 16:00:57 CEST 2006 - lmichnovic@suse.cz + +- fixing defines where to find binary vi and lpr (bindir.diff) + +------------------------------------------------------------------- +Wed Aug 2 13:31:08 CEST 2006 - lmichnovic@suse.cz + +- builds also with new X.org 7.x, detecting prefix in X.org +- building with icecream +- using RPM_OPT_FLAGS + +------------------------------------------------------------------- New: ---- xless-1.7-bindir.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xless.spec ++++++ --- /var/tmp/diff_new_pack.TAybRe/_old 2006-08-02 16:24:54.000000000 +0200 +++ /var/tmp/diff_new_pack.TAybRe/_new 2006-08-02 16:24:54.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package xless (Version 1.7) # -# Copyright (c) 2004 SUSE LINUX AG, 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 @@ -17,13 +17,41 @@ Provides: xless17 Autoreqprov: on Version: 1.7 -Release: 1019 +Release: 1034 Summary: Text browser -Url: ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/ +URL: http://freeware.sgi.com/source/xless/ Source: xless-1.7.tar.bz2 Patch0: xless-1.7.diff Patch1: xless-1.7-fonts.diff +Patch2: xless-1.7-bindir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if "%(xft-config --prefix)" == "/usr" +%define _xorg7libs %_lib +%define _xorg7libs32 lib +%define _xorg7bin bin +%define _xorg7_mandir %_mandir +%define _xorg7pixmaps include +%define _xorg7libshare share +%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 xless 1.7 -- the well-known text browser. Necessary for displaying the @@ -39,35 +67,42 @@ %setup -q %patch0 %patch1 +%patch2 %build xmkmf -a -make +make %{?jobs:-j%jobs} CCOPTIONS="$RPM_OPT_FLAGS" %install -install -d -m 755 ${RPM_BUILD_ROOT}/usr/X11R6/bin/ -install -d -m 755 ${RPM_BUILD_ROOT}/usr/X11R6/man/man1 -install -d -m 755 ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/app-defaults -install -m 755 xless ${RPM_BUILD_ROOT}/usr/X11R6/bin/ -install -m 644 xless.help ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11 -install -m 644 XLess.ad ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/app-defaults/XLess -install -m 644 XLess-co.ad ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/app-defaults/XLess-color -install -m 644 xless.man ${RPM_BUILD_ROOT}/usr/X11R6/man/man1/xless.1x +install -d -m 755 ${RPM_BUILD_ROOT}/usr/%{_xorg7bin}/ +install -d -m 755 ${RPM_BUILD_ROOT}/%{_xorg7_mandir}/man1 +install -d -m 755 ${RPM_BUILD_ROOT}/usr/%{_xorg7libs32}/X11/app-defaults +install -m 755 xless ${RPM_BUILD_ROOT}/usr/%{_xorg7bin}/ +install -m 644 xless.help ${RPM_BUILD_ROOT}/usr/%{_xorg7libs32}/X11/ +install -m 644 XLess.ad ${RPM_BUILD_ROOT}/usr/%{_xorg7libs32}/X11/app-defaults/XLess +install -m 644 XLess-co.ad ${RPM_BUILD_ROOT}/usr/%{_xorg7libs32}/X11/app-defaults/XLess-color +install -m 644 xless.man ${RPM_BUILD_ROOT}/%{_xorg7_mandir}/man1/xless.1x %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) -%docdir /usr/X11R6/man +%docdir %{_xorg7_mandir} %docdir /usr/openwin/man -/usr/X11R6/bin/xless -%config /usr/X11R6/lib/X11/app-defaults/XLess -%config /usr/X11R6/lib/X11/app-defaults/XLess-color -%doc /usr/X11R6/lib/X11/xless.help -%doc /usr/X11R6/man/man1/xless.1x.gz +/usr/%{_xorg7bin}/xless +%config /usr/%{_xorg7libs32}/X11/app-defaults/XLess +%config /usr/%{_xorg7libs32}/X11/app-defaults/XLess-color +%doc /usr/%{_xorg7libs32}/X11/xless.help +%doc %{_xorg7_mandir}/man1/xless.1x.gz %changelog -n xless +* Wed Aug 02 2006 - lmichnovic@suse.cz +- fixing defines where to find binary vi and lpr (bindir.diff) +* Wed Aug 02 2006 - lmichnovic@suse.cz +- builds also with new X.org 7.x, detecting prefix in X.org +- building with icecream +- using RPM_OPT_FLAGS * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Wed Jun 02 2004 - ro@suse.de ++++++ xless-1.7-bindir.diff ++++++ --- xless.h +++ xless.h @@ -52,7 +52,7 @@ */ #ifndef DEFEDITOR -#define DEFEDITOR "/usr/ucb/vi" +#define DEFEDITOR "/usr/bin/vi" #endif /* @@ -70,7 +70,7 @@ */ #ifndef PRINTCMD -#define PRINTCMD "/usr/ucb/lpr" +#define PRINTCMD "/usr/bin/lpr" #endif /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...