Hello community, here is the log from the commit of package xstereograph checked in at Thu Aug 17 18:25:56 CEST 2006. -------- --- xstereograph/xstereograph.changes 2006-07-24 14:54:54.000000000 +0200 +++ xstereograph/xstereograph.changes 2006-08-17 12:39:06.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 17 12:37:29 CEST 2006 - cthiel@suse.de + +- fix build with X.Org 7.1 + +------------------------------------------------------------------- New: ---- xstereograph-X11R7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xstereograph.spec ++++++ --- /var/tmp/diff_new_pack.5waNIc/_old 2006-08-17 18:25:53.000000000 +0200 +++ /var/tmp/diff_new_pack.5waNIc/_new 2006-08-17 18:25:53.000000000 +0200 @@ -18,7 +18,7 @@ License: GPL, LGPL Requires: xless ImageMagick emacs-x11 Version: 2.1 -Release: 589 +Release: 590 URL: http://freshmeat.net/projects/xstereograph/ Source0: %{name}-%{version}.tar.bz2 Source1: libsx-%{version_libsx}.tar.bz2 @@ -28,6 +28,7 @@ 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 @@ -53,6 +54,7 @@ %patch3 %patch4 %patch5 +%patch6 %build # @@ -62,13 +64,13 @@ cd ../.. # # xstereograph -make X11_LIBDIR=/usr/X11R6/%{_lib} +make X11_LIBDIR=/usr/%{_lib}/X11 %install make DESTDIR=$RPM_BUILD_ROOT install -install -d -m 755 $RPM_BUILD_ROOT/usr/X11R6/share/xstereograph/ +install -d -m 755 $RPM_BUILD_ROOT/usr/share/X11/xstereograph/ cp -r depth_maps textures mathfiles magic-eye.xpm stereo_dia.png \ - $RPM_BUILD_ROOT/usr/X11R6/share/xstereograph/ + $RPM_BUILD_ROOT/usr/share/X11/xstereograph/ # # documentation install -d -m 755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ @@ -84,7 +86,9 @@ # libsx cd libsx-%{version_libsx}/src make DESTDIR=$RPM_BUILD_ROOT \ - LIBDIR=/usr/X11R6/%{_lib} \ + LIBDIR=%{_libdir}/X11 \ + INCLUDEDIR=%{_includedir}/X11/SX \ + SHAREDIR=%{_datadir}/X11/libsx \ install # # libsx documentation @@ -106,16 +110,16 @@ %files %defattr(-,root,root) %doc %{_defaultdocdir}/%{name}/ -%doc /usr/X11R6/man/man1/* -/usr/X11R6/bin/* -/usr/X11R6/include/X11/SX/ -/usr/X11R6/share/xstereograph -/usr/X11R6/%{_lib}/lib* -/usr/X11R6/share/libsx -# workaround for build with modular Xorg -%dir /usr/X11R6/include/X11 +%doc %{_mandir}/man1/* +%{_bindir}/* +%{_includedir}/X11/SX +%{_datadir}/X11/xstereograph +%{_datadir}/X11/libsx +%{_libdir}/X11/lib* %changelog -n xstereograph +* Thu Aug 17 2006 - cthiel@suse.de +- fix build with X.Org 7.1 * Mon Jul 24 2006 - mmarek@suse.de - workaround build with modular Xorg * Wed Jan 25 2006 - mls@suse.de ++++++ xstereograph-X11R7.patch ++++++ --- src/Makefile +++ src/Makefile @@ -1,4 +1,4 @@ -BIN_DIR = /usr/X11R6/bin +BIN_DIR = /usr/bin CC = gcc #CFLAGS = -Wall -g CFLAGS = -I../libsx-2.03/src -Wall -O2 $(RPM_OPT_FLAGS) --- stereograph-0.28a/Makefile.in +++ stereograph-0.28a/Makefile.in @@ -14,10 +14,10 @@ install: - 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