From 84cc817cc631196f7a378e73f9062ff622fc7a85 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 23 May 2006 18:32:13 +0000 Subject: [PATCH] multilib --- libgnomecanvas.spec | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec index 862208b..1c604ef 100644 --- a/libgnomecanvas.spec +++ b/libgnomecanvas.spec @@ -8,7 +8,7 @@ Summary: GnomeCanvas widget Name: libgnomecanvas Version: 2.14.0 -Release: 1 +Release: 2 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -19,16 +19,14 @@ BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: libtool -BuildRequires: gtk-doc %description - The canvas widget allows you to create custom displays using stock items such as circles, lines, text, and so on. It was originally a port of the Tk canvas widget but has evolved quite a bit over time. %package devel -Summary: Libraries and headers for libgnomecanvas. +Summary: Libraries and headers for libgnomecanvas Group: Development/Libraries Requires: %name = %{version} Conflicts: gnome-libs-devel < 1.4.1.2 @@ -46,10 +44,8 @@ Tk canvas widget but has evolved quite a bit over time. %setup -q %build -#replace shipped libtool files (bug #78045) -libtoolize -f export CFLAGS=$(echo $RPM_OPT_FLAGS |sed -e 's/O2/O1/g') -%configure --enable-gtk-doc +%configure --disable-gtk-doc export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool @@ -77,22 +73,24 @@ rm -rf %{buildroot} %{_libdir}/lib*.so.* -# avoid the .a file, get .la against better judgment %dir %{_libdir}/libglade %dir %{_libdir}/libglade/2.0 %{_libdir}/libglade/2.0/libcanvas.so -%{_libdir}/libglade/2.0/libcanvas.la %files devel %defattr(-,root,root) -%{_libdir}/lib*.a %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/* %{_datadir}/gtk-doc %changelog +* Tue May 23 2006 Matthias Clasen - 2.14.0-2 +- Fix multilib conflicts +- Don't ship .la files +- Some spec file cleanups + * Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 - Update to 2.14.0