commit libcaca

Hello community, here is the log from the commit of package libcaca checked in at Sun Aug 6 21:54:23 CEST 2006. -------- --- libcaca/libcaca.changes 2006-03-29 18:05:11.000000000 +0200 +++ libcaca/libcaca.changes 2006-08-04 11:14:37.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 4 11:14:21 CEST 2006 - pth@suse.de + +- Adapt to new X11 paths. + +------------------------------------------------------------------- New: ---- libcaca-X11_test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcaca.spec ++++++ --- /var/tmp/diff_new_pack.PUCrN6/_old 2006-08-06 21:54:13.000000000 +0200 +++ /var/tmp/diff_new_pack.PUCrN6/_new 2006-08-06 21:54:13.000000000 +0200 @@ -11,9 +11,9 @@ # norootforbuild Name: libcaca -BuildRequires: doxygen freetype2-devel imlib2-devel slang-devel te_ams te_latex xorg-x11 xorg-x11-devel xorg-x11-libs +BuildRequires: doxygen freetype2-devel imlib2-devel pkgconfig slang-devel te_ams te_latex xorg-x11 xorg-x11-devel xorg-x11-libs Version: 0.9 -Release: 11 +Release: 18 License: GPL Summary: Library for Colour ASCII Art, text mode graphics Group: Development/Languages/C and C++ @@ -22,6 +22,7 @@ Patch0: libcaca-no_slang_acsmap.patch Patch1: libcaca-no_man3_pages.patch Patch2: libcaca-documentation.patch +Patch3: libcaca-X11_test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,6 +38,11 @@ Sam Hocevar Jean-Yves Lamoureux +%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr" +%define _xorg7libs %{_libdir} +%else +%define _xorg7libs /usr/X11R6/%{_lib} +%endif %package devel Summary: Library for Colour ASCII Art, text mode graphics Group: Development/Languages/C and C++ @@ -86,6 +92,7 @@ %endif %patch1 %patch2 +%patch3 %build export CFLAGS="%{optflags}" @@ -95,6 +102,7 @@ --enable-slang \ --enable-ncurses \ --enable-x11 \ + --x-libraries=%{_xorg7libs} \ --enable-imlib2 %{__make} @@ -135,6 +143,8 @@ %{_mandir}/man1/cacaview.1* %changelog -n libcaca +* Fri Aug 04 2006 - pth@suse.de +- Adapt to new X11 paths. * Wed Mar 29 2006 - pth@suse.de - Fix BuildRequires. * Wed Mar 29 2006 - pth@suse.de ++++++ libcaca-X11_test.patch ++++++ --- configure.ac +++ configure.ac @@ -107,7 +107,8 @@ AC_CHECK_LIB(X11, XOpenDisplay, [ac_cv_my_have_x11="yes" if test -n "${x_includes}"; then X_CFLAGS="-I${x_includes}"; fi - if test -n "${x_libraries}"; then X_LIBS="-lX11 -L${x_libraries}"; fi + if test -n "${x_libraries}"; then X_LIBS="-lX11"; fi + if test "${x_libraries}" != "/usr"; then X_LIBS="$X_LIBS -L${x_libraries}"; fi AC_DEFINE(USE_X11, 1, Define to activate the X11 backend driver) CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" CACA_LIBS="${CACA_LIBS} ${X_LIBS}" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...