Hello community, here is the log from the commit of package mgp checked in at Mon Apr 3 18:35:25 CEST 2006. -------- --- mgp/mgp.changes 2006-01-25 21:38:16.000000000 +0100 +++ mgp/mgp.changes 2006-04-03 15:21:08.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 3 15:28:56 CEST 2006 - mmarek@suse.cz + +- fix configure script to find libraries in .../lib64 on 64bit + [#162810] (lib64.patch) + +------------------------------------------------------------------- New: ---- magicpoint-1.11b-lib64.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mgp.spec ++++++ --- /var/tmp/diff_new_pack.TBoRlb/_old 2006-04-03 18:34:46.000000000 +0200 +++ /var/tmp/diff_new_pack.TBoRlb/_new 2006-04-03 18:34:46.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package mgp (Version 1.11b) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, 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://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -18,8 +18,8 @@ Requires: perl freetype sharutils Autoreqprov: on Version: 1.11b -Release: 5 -Summary: MagicPoint is an X Window System Presentation Tool +Release: 12 +Summary: MagicPoint, an X Window System Presentation Tool URL: http://member.wide.ad.jp/wg/mgp/ Source: magicpoint-%{version}.tar.bz2 Source1: README.SuSE @@ -33,6 +33,7 @@ Patch8: magicpoint-%{version}-compile-warning.diff Patch9: magicpoint-%{version}-null.diff Patch10: magicpoint-%{version}-xft-rendering-fix.diff +Patch11: magicpoint-%{version}-lib64.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,8 +41,8 @@ make simple presentations easy while making complicated presentations possible. Its presentation file (the suffix is typically .mgp) is plain text so that you can create presentation files quickly with your -favorite editor (Emacs for example). The package also includes the -tools: mgp2html, mgp2ps, and mgp2latex, which convert mgp presentations +favorite editor (Emacs, for example). The package also includes the +tools mgp2html, mgp2ps, and mgp2latex, which convert mgp presentations into other file formats. @@ -63,12 +64,13 @@ %patch8 -p1 %patch9 %patch10 +%patch11 cp %{SOURCE1} . %build %{?suse_update_config:%{suse_update_config -f}} autoreconf --force --install -CFLAGS=$RPM_OPT_FLAGS LIBS="$LIBS -L/opt/gnome/%_lib" \ +CFLAGS=$RPM_OPT_FLAGS LIBS="$LIBS -L/opt/gnome/%_lib" _lib=%{_lib} \ ./configure \ --prefix=/usr --mandir=%{_mandir} --enable-gif --enable-imlib \ --enable-locale --disable-vflib --enable-freetype-charset16 \ @@ -104,6 +106,9 @@ %{_prefix}/share/emacs/site-lisp/mgp-mode20.* %changelog -n mgp +* Mon Apr 03 2006 - mmarek@suse.cz +- fix configure script to find libraries in .../lib64 on 64bit + [#162810] (lib64.patch) * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Tue Nov 15 2005 - mmarek@suse.cz ++++++ magicpoint-1.11b-lib64.diff ++++++ _lib is set to "lib" or "lib64" in the spec file --- configure.in +++ configure.in @@ -29,6 +29,7 @@ AC_SUBST(OPTFLAGS) DEPLIBS= AC_SUBST(DEPLIBS) +test -z "$_lib" && _lib=lib case $host_os in freebsd5*|freebsd4*|freebsd3*|freebsd2.2.6*|freebsd2.2.7*|freebsd2.2.8*) @@ -95,22 +96,22 @@ for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr /usr/include/freetype1 /sw; do ac_cv_ft_lib=no ac_cv_ft_include=no - shlib1=`echo $dir/lib/libttf.so* | head -n 1 | sed -e 's/.*\///'` - shlib2=`echo $dir/lib/libttf.dylib* | head -n 1 | sed -e 's/.*\///'` + shlib1=`echo $dir/$_lib/libttf.so* | head -n 1 | sed -e 's/.*\///'` + shlib2=`echo $dir/$_lib/libttf.dylib* | head -n 1 | sed -e 's/.*\///'` if test x$shlib1 = x; then shlib1=no fi if test x$shlib2 = x; then shlib2=no fi - if test -d $dir/lib -a -f $dir/lib/$shlib1; then - ac_cv_ft_lib="$dir/lib" + if test -d $dir/$_lib -a -f $dir/$_lib/$shlib1; then + ac_cv_ft_lib="$dir/$_lib" ac_cv_ft_libpath="$shlib1" - elif test -d $dir/lib -a -f $dir/lib/$shlib2; then - ac_cv_ft_lib="$dir/lib" + elif test -d $dir/$_lib -a -f $dir/$_lib/$shlib2; then + ac_cv_ft_lib="$dir/$_lib" ac_cv_ft_libpath="$shlib2" - elif test -d $dir/lib -a -f $dir/lib/libttf.a; then - ac_cv_ft_lib="$dir/lib" + elif test -d $dir/$_lib -a -f $dir/$_lib/libttf.a; then + ac_cv_ft_lib="$dir/$_lib" ac_cv_ft_libpath="libttf.a" fi if test -d $dir/include -a -f $dir/include/freetype.h; then @@ -164,27 +165,27 @@ ac_cv_vf_libname=VFlib ac_cv_vf_libdir=no ac_cv_vf_hdrdir=no - shlib1=`echo $dir/lib/libVFlib.so* | head -n 1 | sed -e 's/.*\///'` - shlib2=`echo $dir/lib/libVFlib2.so* | head -n 1 | sed -e 's/.*\///'` + shlib1=`echo $dir/$_lib/libVFlib.so* | head -n 1 | sed -e 's/.*\///'` + shlib2=`echo $dir/$_lib/libVFlib2.so* | head -n 1 | sed -e 's/.*\///'` if test x$shlib1 = x; then $shlib1=no fi if test x$shlib2 = x; then $shlib2=no fi - if test -d $dir/lib -a -f $dir/lib/$shlib1; then - ac_cv_vf_libdir="$dir/lib" + if test -d $dir/$_lib -a -f $dir/$_lib/$shlib1; then + ac_cv_vf_libdir="$dir/$_lib" ac_cv_vf_libpath=$shlib1 - elif test -d $dir/lib -a -f $dir/lib/libVFlib.a; then - ac_cv_vf_libdir="$dir/lib" + elif test -d $dir/$_lib -a -f $dir/$_lib/libVFlib.a; then + ac_cv_vf_libdir="$dir/$_lib" ac_cv_vf_libpath="libVFlib.a" - elif test -d $dir/lib -a -f $dir/lib/$shlib2; then + elif test -d $dir/$_lib -a -f $dir/$_lib/$shlib2; then ac_cv_vf_libname=VFlib2 - ac_cv_vf_libdir="$dir/lib" + ac_cv_vf_libdir="$dir/$_lib" ac_cv_vf_libpath=$shlib2 - elif test -d $dir/lib -a -f $dir/lib/libVFlib2.a; then + elif test -d $dir/$_lib -a -f $dir/$_lib/libVFlib2.a; then ac_cv_vf_libname=VFlib2 - ac_cv_vf_libdir="$dir/lib" + ac_cv_vf_libdir="$dir/$_lib" ac_cv_vf_libpath="libVFlib2.a" fi if test -d $dir/include -a -f $dir/include/VF.h; then @@ -271,14 +272,14 @@ if test "$use_libpng" = ""; then for i in /usr/pkg /usr/local /usr /sw; do if test -f $i/include/png.h; then - if test -f $i/lib/libpng.a ; then - DEPLIBS="$DEPLIBS $i/lib/libpng.a" - elif test -f $i/lib/libpng.so ; then - DEPLIBS="$DEPLIBS $i/lib/libpng.so" + if test -f $i/$_lib/libpng.a ; then + DEPLIBS="$DEPLIBS $i/$_lib/libpng.a" + elif test -f $i/$_lib/libpng.so ; then + DEPLIBS="$DEPLIBS $i/$_lib/libpng.so" else break; fi - LIBS="$LIBS -L$i/lib" + LIBS="$LIBS -L$i/$_lib" OPTFLAGS="$OPTFLAGS -I$i/include" AC_CHECK_LIB(png, png_read_image, [LIBS="$LIBS -lpng" @@ -294,17 +295,17 @@ for i in /usr/pkg /usr/local /usr; do if test -f $i/include/libmng.h; then - if test -f $i/lib/libmng.a ; then - DEPLIBS="$DEPLIBS $i/lib/libmng.a" - elif test -f $i/lib/libmng.so ; then - DEPLIBS="$DEPLIBS $i/lib/libmng.so" + if test -f $i/$_lib/libmng.a ; then + DEPLIBS="$DEPLIBS $i/$_lib/libmng.a" + elif test -f $i/$_lib/libmng.so ; then + DEPLIBS="$DEPLIBS $i/$_lib/libmng.so" else break; fi - LIBS="$LIBS -L$i/lib" + LIBS="$LIBS -L$i/$_lib" OPTFLAGS="$OPTFLAGS -I$i/include" AC_CHECK_LIB(mng, mng_initialize, - [LIBS="$LIBS -Wl,-rpath,$i/lib -lmng" + [LIBS="$LIBS -Wl,-rpath,$i/$_lib -lmng" AC_DEFINE(MNG)], [AC_CHECK_LIB(mng, mng_readdisplay, [LIBS="$LIBS -lmng -ljpeg" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...