Hello community, here is the log from the commit of package xli checked in at Mon Jul 24 15:49:53 CEST 2006. -------- --- xli/xli.changes 2006-01-25 21:43:12.000000000 +0100 +++ xli/xli.changes 2006-07-22 20:20:36.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jul 22 20:18:38 CEST 2006 - lmichnovic@suse.cz + +- create config file in /usr/lib/X11/Xli as sugested in man page + (configfile.patch) +- now builds also with new X.org 7.x + +------------------------------------------------------------------- New: ---- xli-1.17.0-configfile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xli.spec ++++++ --- /var/tmp/diff_new_pack.HUBcdh/_old 2006-07-24 15:49:38.000000000 +0200 +++ /var/tmp/diff_new_pack.HUBcdh/_new 2006-07-24 15:49:38.000000000 +0200 @@ -5,7 +5,7 @@ # 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://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,14 +17,40 @@ Provides: xli115 Autoreqprov: on Version: 20050904 -Release: 4 +Release: 16 Summary: X11 Image Loading Utility URL: http://pantransit.reptiles.org/prog Source: xli-1.17.0-%{version}.tar.bz2 Patch0: xli-1.17.0.patch Patch1: xli-1.17.0-overflow.patch 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 +%define _xorg7libs %_lib +%define _xorg7libs32 lib +%define _xorg7bin bin +%define _xorg7mandir %_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 +%endif %description xli is a version of xloadimage. @@ -44,13 +70,15 @@ %patch0 %patch1 %patch2 -xmkmf -a +%patch3 %build -make all CCOPTIONS="$RPM_OPT_FLAGS -fstack-protector" +xmkmf -a +make %{?jobs:-j%jobs} all CCOPTIONS="$RPM_OPT_FLAGS -fstack-protector" %install -make BINDIR=$RPM_BUILD_ROOT/usr/X11R6/bin install +mkdir -p $RPM_BUILD_ROOT/usr/lib/X11 +make BINDIR=$RPM_BUILD_ROOT/usr/%{_xorg7bin} install make DESTDIR=$RPM_BUILD_ROOT install.man %clean @@ -58,14 +86,19 @@ %files %doc README* ABOUTGAMMA -%doc /usr/X11R6/man/man1/xli.1x.gz -%doc /usr/X11R6/man/man1/xlito.1x.gz -/usr/X11R6/bin/xli -/usr/X11R6/bin/xlito -/usr/X11R6/bin/xsetbg -/usr/X11R6/bin/xview +%doc %{_xorg7mandir}/man1/xli.1x.gz +%doc %{_xorg7mandir}/man1/xlito.1x.gz +/usr/%{_xorg7bin}/xli +/usr/%{_xorg7bin}/xlito +/usr/%{_xorg7bin}/xsetbg +/usr/%{_xorg7bin}/xview +/usr/lib/X11/Xli %changelog -n xli +* Sat Jul 22 2006 - lmichnovic@suse.cz +- create config file in /usr/lib/X11/Xli as sugested in man page + (configfile.patch) +- now builds also with new X.org 7.x * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Thu Jan 12 2006 - lmichnovic@suse.cz ++++++ xli-1.17.0-configfile.patch ++++++ --- Imakefile +++ Imakefile @@ -19,7 +19,7 @@ PNG_INCLUDES = PNG_LDFLAGS = -SYSPATHFILE = $(XAPPLOADDIR)/Xli +SYSPATHFILE = $(RPM_BUILD_ROOT)/usr/lib/X11/Xli DEPLIBS = $(DEPXLIB) LOCAL_LIBRARIES = $(XLIB) $(JPEG_LDFLAGS) $(PNG_LDFLAGS) -ljpeg -lpng -lz SYS_LIBRARIES = -lm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org