Hello community, here is the log from the commit of package xstereograph checked in at Fri Aug 24 02:13:48 CEST 2007. -------- --- xstereograph/xstereograph.changes 2007-06-01 17:15:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/xstereograph/xstereograph.changes 2007-08-22 08:38:58.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 22 08:38:20 CEST 2007 - anosek@suse.cz + +- changed prefix /usr/bin/X11 -> /usr/bin +- dropped obsoleted xstereograph-X11R7.patch + +------------------------------------------------------------------- Old: ---- xstereograph-X11R7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xstereograph.spec ++++++ --- /var/tmp/diff_new_pack.N18377/_old 2007-08-24 02:13:33.000000000 +0200 +++ /var/tmp/diff_new_pack.N18377/_new 2007-08-24 02:13:33.000000000 +0200 @@ -15,10 +15,10 @@ %define version_libsx 2.03 Summary: Stereogram generator Group: Amusements/Games/Other -License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: GPL v2 or later, LGPL v2 or later Requires: xless ImageMagick emacs-x11 Version: 2.1 -Release: 648 +Release: 671 URL: http://freshmeat.net/projects/xstereograph/ Source0: %{name}-%{version}.tar.bz2 Source1: libsx-%{version_libsx}.tar.bz2 @@ -28,7 +28,6 @@ Patch3: %{name}-%{version}-dialogs.patch Patch4: %{name}-%{version}-gcc4.patch Patch5: %{name}-%{version}-uninitialized.patch -Patch6: %{name}-X11R7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,7 +53,6 @@ %patch3 %patch4 %patch5 -%patch6 %build # @@ -64,13 +62,13 @@ cd ../.. # # xstereograph -make X11_LIBDIR=/usr/%{_lib}/X11 +make X11_LIBDIR=/usr/%{_lib} %install make DESTDIR=$RPM_BUILD_ROOT install -install -d -m 755 $RPM_BUILD_ROOT/usr/share/X11/xstereograph/ +install -d -m 755 $RPM_BUILD_ROOT/usr/share/xstereograph/ cp -r depth_maps textures mathfiles magic-eye.xpm stereo_dia.png \ - $RPM_BUILD_ROOT/usr/share/X11/xstereograph/ + $RPM_BUILD_ROOT/usr/share/xstereograph/ # # documentation install -d -m 755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ @@ -86,9 +84,9 @@ # libsx cd libsx-%{version_libsx}/src make DESTDIR=$RPM_BUILD_ROOT \ - LIBDIR=%{_libdir}/X11 \ - INCLUDEDIR=%{_includedir}/X11/SX \ - SHAREDIR=%{_datadir}/X11/libsx \ + LIBDIR=%{_libdir} \ + INCLUDEDIR=%{_includedir}/SX \ + SHAREDIR=%{_datadir}/libsx \ install # # libsx documentation @@ -112,12 +110,15 @@ %doc %{_defaultdocdir}/%{name}/ %doc %{_mandir}/man1/* %{_bindir}/* -%{_includedir}/X11/SX -%{_datadir}/X11/xstereograph -%{_datadir}/X11/libsx -%{_libdir}/X11/lib* +%{_includedir}/SX +%{_datadir}/xstereograph +%{_datadir}/libsx +%{_libdir}/lib* %changelog +* Wed Aug 22 2007 - anosek@suse.cz +- changed prefix /usr/bin/X11 -> /usr/bin +- dropped obsoleted xstereograph-X11R7.patch * Fri Jun 01 2007 - dmueller@suse.de - fix buildrequires * Thu Aug 17 2006 - cthiel@suse.de ++++++ xstereograph-2.1-dialogs.patch ++++++ --- /var/tmp/diff_new_pack.N18377/_old 2007-08-24 02:13:33.000000000 +0200 +++ /var/tmp/diff_new_pack.N18377/_new 2007-08-24 02:13:33.000000000 +0200 @@ -1,14 +1,3 @@ ---- libsx-2.03/src/dialogs/Makefile -+++ libsx-2.03/src/dialogs/Makefile -@@ -2,7 +2,7 @@ - # Makefile for the libsx dialogs - # - --SHAREDIR=/usr/share/libsx -+SHAREDIR=/usr/X11R6/share/libsx - - install: - mkdirhier $(SHAREDIR) --- libsx-2.03/src/libsx.c +++ libsx-2.03/src/libsx.c @@ -86,10 +86,10 @@ @@ -16,7 +5,7 @@ if (language==NULL) language=getenv("LANG"); - sprintf(locale_file, "/usr/share/libsx/dialogs.%c%c", -+ sprintf(locale_file, "/usr/X11R6/share/libsx/dialogs.%c%c", ++ sprintf(locale_file, "/usr/share/libsx/dialogs.%c%c", language[0], language[1]); fd = fopen(locale_file, "r"); - if (fd==NULL) { locale_file[25] = 'e'; locale_file[26] = 'n'; } ++++++ xstereograph-2.1.patch ++++++ --- /var/tmp/diff_new_pack.N18377/_old 2007-08-24 02:13:33.000000000 +0200 +++ /var/tmp/diff_new_pack.N18377/_new 2007-08-24 02:13:33.000000000 +0200 @@ -24,9 +24,9 @@ -LIBDIR=/usr/X11/lib -INCLUDEDIR=/usr/X11/include/X11/SX -SHAREDIR=/usr/share/libsx -+LIBDIR=/usr/X11R6/lib -+INCLUDEDIR=/usr/X11R6/include/X11/SX -+SHAREDIR=/usr/X11R6/share/libsx ++LIBDIR=/usr/lib ++INCLUDEDIR=/usr/include/X11/SX ++SHAREDIR=/usr/share/libsx CC=gcc @@ -53,7 +53,7 @@ +++ src/Makefile @@ -1,24 +1,26 @@ -BIN_DIR = /usr/games/bin -+BIN_DIR = /usr/X11R6/bin ++BIN_DIR = /usr/bin CC = gcc #CFLAGS = -Wall -g -CFLAGS = -Wall -O2 @@ -63,7 +63,7 @@ # XLIBS = -L/usr/X11R6/lib -lsx -lXt -lXpm -lXaw -lX11 # XLIBS = -L/usr/X11R6/lib -lsx -lXt -lXpm -lXaw3d -lX11 -XLIBS = -L/usr/X11R6/lib -lsx -lXt -lXpm -lXaw95 -lX11 -+X11_LIBDIR = /usr/X11R6/lib ++X11_LIBDIR = /usr/lib +XLIBS = -L../libsx-2.03/src -L$(X11_LIBDIR) -lsx -lXt -lXpm -lXaw3d -lX11 all: xstereograph @@ -71,7 +71,7 @@ xstereograph: help.h xstereograph.c - echo "#define SISDIR \"`cd .. ; pwd`\"" > config.h - $(CC) $(XLIBS) $(LDFLAGS) xstereograph.c -o xstereograph -+ echo "#define SISDIR \"/usr/X11R6/share/xstereograph\"" > config.h ++ echo "#define SISDIR \"/usr/share/xstereograph\"" > config.h + $(CC) $(CFLAGS) $(XLIBS) $(LDFLAGS) xstereograph.c -o xstereograph clean: @@ -124,10 +124,10 @@ install: - cp stereograph /usr/local/bin/stereograph -+ mkdir -p $(DESTDIR)/usr/X11R6/bin -+ mkdir -p $(DESTDIR)/usr/X11R6/man/man1/ -+ cp stereograph $(DESTDIR)/usr/X11R6/bin/stereograph -+ cp stereograph.1 $(DESTDIR)/usr/X11R6/man/man1/ ++ mkdir -p $(DESTDIR)/usr/bin ++ mkdir -p $(DESTDIR)/usr/share/man/man1/ ++ cp stereograph $(DESTDIR)/usr/bin/stereograph ++ cp stereograph.1 $(DESTDIR)/usr/share/man/man1/ clean: rm -f $(OBJ0) stereograph core ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org