pcpa wrote:
> Author: pcpa
> Date: Fri May 30 23:00:50 2008
> New Revision: 213554
>
> Removed:
>   cooker/bonobo/current/SOURCES/bonobo-1.0.22-libtool.patch.bz2
> Modified:
>   cooker/bonobo/current/SPECS/bonobo.spec
>
> Log:
>  Use system libtool, and ensure /usr/X11R6 files are not advertised in
> .la and -config files.
>
>
> Modified: cooker/bonobo/current/SPECS/bonobo.spec
> ==============================================================================
> --- cooker/bonobo/current/SPECS/bonobo.spec  (original)
> +++ cooker/bonobo/current/SPECS/bonobo.spec  Fri May 30 23:00:50 2008
> @@(protected) @@
> Name:    bonobo
> Summary:  Library for compound documents in GNOME
> Version:  1.0.22
> -Release:  %mkrel 14
> +Release:  %mkrel 15
> License:  GPL
> Group:    System/Libraries
> Source0:  ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.bz2
> # (fc) 1.0.20-4mdk don't add -L/usr/lib to ldflags
> Patch0:    bonobo-1.0.20-libdir.patch.bz2
> -# (gb) 1.0.22-8mdk stick to built-in libtool 1.4 with fixes
> -Patch1:    bonobo-1.0.22-libtool.patch.bz2
> # (neoclust) 1.0.22-8mdk Patch to make it build with gcc4
> Patch2:      bonobo-1.0.22-gcc4.patch.bz2
> # (Anssi 05/2008) Fix underlinking
> @@(protected) @@
> %if %{build_xvfb}
> BuildRequires: XFree86-Xvfb
> %endif
> +BuildRequires:  libtool
>
> %description
> Bonobo is a library that provides the necessary framework for GNOME
> @@(protected) @@
> %prep
> %setup -q
> %patch0 -p1 -b .libdir
> -%patch1 -p1 -b .libtool
> %patch2 -p1 -b .gcc4
> %patch3 -p1
> %patch4 -p1
>
> -# needed by patch0,3 and regenerate_configure
> -# (Anssi 05/2008) does not work with new autoconf
> -autoconf-2.13
> -automake-1.4

So, here you basically disable my Patch3 (and possibly Frederic's
Patch0), even though the patches are still applied. Why?

> -# ... but libefs does not work with old autotools:
> autoreconf -if libefs
>
> %build
> %configure2_5x
>
> -# use only one (correct) implementation of libtool
> -rm -f libefs/libtool
> -ln -s ../libtool libefs/libtool
> +# Use system libtool and
> +# don't expliclity include or link to files under /usr/X11R6
> +perl -pi -e '\
> +s@/X11R6/@/@(protected);\
> +s@(protected)@'\
> +   `find . -name Makefile`
>
> -# Don't expliclity include or link to files under /usr/X11R6
> -perl -pi -e 's@/X11R6/@/@(protected)`

Interesting, wouldn't the usual 'libtoolize --copy --force' (possibly
with aclocal) have worked? IMO it would've been nicer than this hack.

> +# Fix underlinked libraries
> +perl -pi -e '\
> +s@(protected)@;\
> +s@(protected)@'\
> +   bonobo/Makefile

So here you basically re-do my patch3 (that you effectively disabled)
with a perl hack?!

> # parallel build is broken, don't use macro
> make
>


--
Anssi Hannula