Hello community,
here is the log from the commit of package xli for openSUSE:Factory
checked in at Mon May 3 21:28:19 CEST 2010.
--------
--- xli/xli.changes 2010-04-04 18:51:55.000000000 +0200
+++ xli/xli.changes 2010-05-01 11:09:06.000000000 +0200
@@ -1,0 +2,6 @@
+Sat May 1 09:08:08 UTC 2010 - prusnak@suse.cz
+
+- provide also xloadimage
+- cleanup specfile
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xli.spec ++++++
--- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200
+++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200
@@ -18,14 +18,10 @@
Name: xli
-BuildRequires: libjpeg-devel libpng-devel xorg-x11-devel
-%define ver 2005-09-04
License: MIT
Group: System/X11/Utilities
-Provides: xli115
-AutoReqProv: on
Version: 20061110
-Release: 126
+Release: 127
Summary: X11 Image Loading Utility
Url: http://pantransit.reptiles.org/prog
Source: xli-2006-11-10.tar.bz2
@@ -35,33 +31,9 @@
Patch3: xli-1.17.0-configfile.patch
Patch4: xli-png_check_sig.patch
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
+BuildRequires: libjpeg-devel libpng-devel xorg-x11-devel
+Provides: xli115
+Provides: xloadimage = %{version}
%description
xli is a version of xloadimage.
@@ -69,13 +41,6 @@
This utility will view several types of images under X11, or load
images onto the X11 root window.
-
-
-Authors:
---------
- Graeme Gill
- Smarasderagd
-
%prep
%setup -q -n xli-2006-11-10
%patch0
@@ -86,12 +51,14 @@
%build
xmkmf -a
-make %{?jobs:-j%jobs} all CCOPTIONS="$RPM_OPT_FLAGS -fstack-protector"
+make %{?_smp_mflags} all CCOPTIONS="$RPM_OPT_FLAGS"
%install
mkdir -p $RPM_BUILD_ROOT/usr/lib/X11
-make BINDIR=$RPM_BUILD_ROOT/usr/%{_xorg7bin} install
+make BINDIR=$RPM_BUILD_ROOT%{_bindir} install
make DESTDIR=$RPM_BUILD_ROOT install.man
+ln -s xli $RPM_BUILD_ROOT%{_bindir}/xloadimage
+ln -s xli.1x.gz $RPM_BUILD_ROOT%{_mandir}/man1/xloadimage.1x.gz
%clean
rm -rf $RPM_BUILD_ROOT
@@ -99,12 +66,14 @@
%files
%defattr(-,root,root)
%doc README* ABOUTGAMMA
-%doc %{_xorg7_mandir}/man1/xli.1x.gz
-%doc %{_xorg7_mandir}/man1/xlito.1x.gz
-/usr/%{_xorg7bin}/xli
-/usr/%{_xorg7bin}/xlito
-/usr/%{_xorg7bin}/xsetbg
-/usr/%{_xorg7bin}/xview
+%doc %{_mandir}/man1/xli.1x.gz
+%doc %{_mandir}/man1/xlito.1x.gz
+%doc %{_mandir}/man1/xloadimage.1x.gz
+%{_bindir}/xli
+%{_bindir}/xlito
+%{_bindir}/xloadimage
+%{_bindir}/xsetbg
+%{_bindir}/xview
/usr/lib/X11/Xli
%changelog
++++++ xli-1.17.0-8bit_palette.patch ++++++
--- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200
+++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200
@@ -1,4 +1,6 @@
---- pcx.c
+Index: pcx.c
+===================================================================
+--- pcx.c.orig
+++ pcx.c
@@ -5,6 +5,8 @@
** Adapted from code by Jef Poskanzer (see Copyright below).
@@ -20,7 +22,7 @@
/*
-@@ -129,35 +133,43 @@
+@@ -129,35 +133,43 @@ Image *pcxLoad (char *fullname, ImageOpt
xmax = xmax - xmin + 1;
ymax = ymax - ymin + 1;
in_bpr = pcxhd[66] + ( 256 * pcxhd[67] );
@@ -73,7 +75,7 @@
read_trail_opt(image_ops,zf,image,verbose);
zclose(zf);
-@@ -173,7 +185,8 @@
+@@ -173,7 +185,8 @@ Image *pcxLoad (char *fullname, ImageOpt
** Returns FALSE if there was a short read.
*/
@@ -83,7 +85,7 @@
{
/* Goes like this: Read a byte. If the two high bits are set,
** then the low 6 bits contain a repeat count, and the byte to
-@@ -185,10 +198,12 @@
+@@ -185,10 +198,12 @@ static boolean PCX_LoadImage (ZFILE *zf,
int row = 0;
int bytes_this_row = 0;
int b, i, cnt;
@@ -97,7 +99,7 @@
if ((b & 0xC0) == 0xC0) {
/* have a repetition count -- mask flag bits */
-@@ -201,12 +216,14 @@
+@@ -201,12 +216,14 @@ static boolean PCX_LoadImage (ZFILE *zf,
cnt = 1; /* no repeating this one */
}
@@ -114,7 +116,7 @@
if (++bytes_this_row == in_bpr) {
/* start of a new line */
row++;
-@@ -214,6 +231,25 @@
+@@ -214,6 +231,25 @@ static boolean PCX_LoadImage (ZFILE *zf,
}
}
}
++++++ xli-1.17.0-configfile.patch ++++++
--- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200
+++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200
@@ -1,6 +1,8 @@
---- Imakefile
+Index: Imakefile
+===================================================================
+--- Imakefile.orig
+++ Imakefile
-@@ -19,7 +19,7 @@
+@@ -19,7 +19,7 @@ JPEG_LDFLAGS =
PNG_INCLUDES =
PNG_LDFLAGS =
++++++ xli-1.17.0-overflow.patch ++++++
--- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200
+++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200
@@ -1,4 +1,6 @@
---- ddxli.h
+Index: ddxli.h
+===================================================================
+--- ddxli.h.orig
+++ ddxli.h
@@ -36,11 +36,13 @@
@@ -14,9 +16,11 @@
#endif
#ifndef bfill
#define bfill(P,N,C) memset((P),(C),(N))
---- faces.c
+Index: faces.c
+===================================================================
+--- faces.c.orig
+++ faces.c
-@@ -56,9 +56,15 @@
+@@ -56,9 +56,15 @@ isFaces(ZFILE *zf, char *name, char *fna
if (! strcmp(buf, "\n"))
break;
if (!strncmp(buf, "FirstName:", 10))
@@ -34,9 +38,11 @@
else if (!strncmp(buf, "Image:", 6)) {
if (sscanf(buf + 7, "%d%d%d", &iw, &ih, &id) != 3) {
fprintf(stderr,"facesLoad: %s - Bad image\n", name);
---- reduce.c
+Index: reduce.c
+===================================================================
+--- reduce.c.orig
+++ reduce.c
-@@ -178,7 +178,8 @@
+@@ -178,7 +178,8 @@ Image *reduce(Image *image, unsigned col
/* get destination image */
depth = colorsToDepth(OutColors);
new_image = newRGBImage(image->width, image->height, depth);
@@ -46,9 +52,11 @@
new_image->title = dupString(buf);
new_image->gamma = image->gamma;
---- zoom.c
+Index: zoom.c
+===================================================================
+--- zoom.c.orig
+++ zoom.c
-@@ -52,28 +52,29 @@
+@@ -52,28 +52,29 @@ Image *zoom(Image *oimage, unsigned int
if (verbose)
printf(" Zooming image Y axis by %d%%...", yzoom);
if (changetitle)
++++++ xli-1.17.0.patch ++++++
--- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200
+++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200
@@ -1,5 +1,7 @@
---- ddxli.h 1999-10-25 04:14:53.000000000 +0200
-+++ ddxli.h 2005-09-08 12:07:33.948259924 +0200
+Index: ddxli.h
+===================================================================
+--- ddxli.h.orig
++++ ddxli.h
@@ -14,7 +14,7 @@
#include
#include
@@ -9,8 +11,10 @@
#include
#ifndef index /* some SysV's do this for you */
#define index strchr
---- Imakefile 2005-09-05 07:01:30.000000000 +0200
-+++ Imakefile 2005-09-08 12:07:33.931258518 +0200
+Index: Imakefile
+===================================================================
+--- Imakefile.orig
++++ Imakefile
@@ -9,7 +9,7 @@
# -DHAVE_BOOLEAN if your system declares 'boolean' somewhere
# -DHAVE_BUNZIP2 if you have bzip2 and want to handle .bz2 files
@@ -20,7 +24,7 @@
CCOPTIONS = -Aa -D_HPUX_SOURCE
#endif
-@@ -38,8 +38,8 @@
+@@ -38,8 +38,8 @@ ComplexProgramTarget_2(xlito,,)
install:: $(SYSPATHFILE)
$(RM) $(BINDIR)/xview $(BINDIR)/xsetbg
@@ -31,9 +35,11 @@
$(SYSPATHFILE):
@echo "*** Creating default $(SYSPATHFILE) since you"
---- root.c 2005-09-05 07:01:30.000000000 +0200
-+++ root.c 2005-09-08 12:07:34.013265302 +0200
-@@ -55,8 +55,8 @@
+Index: root.c
+===================================================================
+--- root.c.orig
++++ root.c
+@@ -55,8 +55,8 @@ static void freePrevious(Display * dpy,
Pixmap *pm;
Atom actual_type; /* NOTUSED */
int format;
@@ -44,7 +50,7 @@
/* intern the property name */
Atom atom = XInternAtom(dpy, RETAIN_PROP_NAME, 0);
-@@ -64,8 +64,7 @@
+@@ -64,8 +64,7 @@ static void freePrevious(Display * dpy,
/* look for existing resource allocation */
if ((XGetWindowProperty(dpy, w, atom, 0, 1, 1 /*delete */ ,
AnyPropertyType, &actual_type, &format,
@@ -54,7 +60,7 @@
(unsigned char **) &pm) == Success) &&
nitems == 1) {
if ((actual_type == XA_PIXMAP) && (format == 32) &&
-@@ -162,14 +161,13 @@
+@@ -162,14 +161,13 @@ void imageOnRoot(DisplayInfo * dinfo, Im
for (i = 0; i < numChildren; i++) {
Atom actual_type;
int actual_format;
++++++ xli-png_check_sig.patch ++++++
--- /var/tmp/diff_new_pack.qElNIr/_old 2010-05-03 21:26:17.000000000 +0200
+++ /var/tmp/diff_new_pack.qElNIr/_new 2010-05-03 21:26:17.000000000 +0200
@@ -1,4 +1,6 @@
---- png.c
+Index: png.c
+===================================================================
+--- png.c.orig
+++ png.c
@@ -11,7 +11,7 @@
@@ -9,7 +11,7 @@
static int check_png(char *file_name)
{
ZFILE *zfp;
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,7 @@ static int check_png(char *file_name)
if (ret != 8)
return 0;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org