rpms/libmatchbox
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- libmatchbox-1.9-add-needed.patch: Fix FTBFS from --no-add-needed

Browse Source
This commit is contained in:
Adam Jackson 2010-02-16 23:44:48 +00:00
parent 0b79027133
commit 736377d2c0
2 changed files with 20 additions and 1 deletions

12
libmatchbox-1.9-add-needed.patch Normal file
View File

@ -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

9
libmatchbox.spec
View File

@ -1,14 +1,16 @@
Summary: Libraries for the Matchbox Desktop Summary: Libraries for the Matchbox Desktop
Name: libmatchbox Name: libmatchbox
Version: 1.9 Version: 1.9
Release: 6%{?dist} Release: 7%{?dist}
Url: http://projects.o-hand.com/matchbox/ Url: http://projects.o-hand.com/matchbox/
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
Source: http://projects.o-hand.com/matchbox/sources/libmatchbox/%{version}/%{name}-%{version}.tar.bz2 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: pango-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: autoconf automake libtool
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description %description
@ -31,8 +33,10 @@ Static libraries and header files from %{name}
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .add-needed
%build %build
autoreconf -v --install
%configure --enable-png --enable-jpeg --enable-pango %configure --enable-png --enable-jpeg --enable-pango
make %{?_smp_mflags} make %{?_smp_mflags}
@ -63,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/libmb/*.h %{_includedir}/libmb/*.h
%changelog %changelog
* Tue Feb 16 2010 Adam Jackson <ajax@redhat.com> 1.9-7
- libmatchbox-1.9-add-needed.patch: Fix FTBFS from --no-add-needed
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-6 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild