diff --git a/libmatchbox-1.9-add-needed.patch b/libmatchbox-1.9-add-needed.patch new file mode 100644 index 0000000..f4c8294 --- /dev/null +++ b/libmatchbox-1.9-add-needed.patch @@ -0,0 +1,12 @@ +diff -up libmatchbox-1.9/tests/Makefile.am.jx libmatchbox-1.9/tests/Makefile.am +--- libmatchbox-1.9/tests/Makefile.am.jx 2006-07-07 11:16:57.000000000 -0400 ++++ libmatchbox-1.9/tests/Makefile.am 2010-02-16 18:45:35.000000000 -0500 +@@ -3,7 +3,7 @@ SUBDIRS = menu + TESTS = dot-desktop pixbuf + + AM_CPPFLAGS = @CHECK_CFLAGS@ -I../libmb @GCC_WARNINGS@ @XLIBS_CFLAGS@ @PANGO_CFLAGS@ @PNG_CFLAGS@ +-AM_LDFLAGS = -L../libmb -lmb ++AM_LDFLAGS = -L../libmb -lmb @XLIBS_LIBS@ + + if HAVE_CHECK + diff --git a/libmatchbox.spec b/libmatchbox.spec index 6fdc212..6d99273 100644 --- a/libmatchbox.spec +++ b/libmatchbox.spec @@ -1,14 +1,16 @@ Summary: Libraries for the Matchbox Desktop Name: libmatchbox Version: 1.9 -Release: 6%{?dist} +Release: 7%{?dist} Url: http://projects.o-hand.com/matchbox/ License: LGPLv2+ Group: Development/Libraries Source: http://projects.o-hand.com/matchbox/sources/libmatchbox/%{version}/%{name}-%{version}.tar.bz2 +Patch0: libmatchbox-1.9-add-needed.patch BuildRequires: pango-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel +BuildRequires: autoconf automake libtool Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -31,8 +33,10 @@ Static libraries and header files from %{name} %prep %setup -q +%patch0 -p1 -b .add-needed %build +autoreconf -v --install %configure --enable-png --enable-jpeg --enable-pango make %{?_smp_mflags} @@ -63,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libmb/*.h %changelog +* Tue Feb 16 2010 Adam Jackson 1.9-7 +- libmatchbox-1.9-add-needed.patch: Fix FTBFS from --no-add-needed + * Fri Jul 24 2009 Fedora Release Engineering - 1.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild