rpms/libgnomecanvas/devel libgnomecanvas.spec,1.28,1.29
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue May 23 18:32:39 UTC 2006
- Previous message (by thread): rpms/xorg-x11-server/devel .cvsignore, 1.15, 1.16 sources, 1.12, 1.13 xorg-x11-server.spec, 1.60, 1.61 fb-fix-transforms.patch, 1.1, NONE
- Next message (by thread): rpms/libgnomecanvas/devel libgnomecanvas.spec,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/dist/rpms/libgnomecanvas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv881
Modified Files:
libgnomecanvas.spec
Log Message:
multilib
Index: libgnomecanvas.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecanvas/devel/libgnomecanvas.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libgnomecanvas.spec 13 Mar 2006 14:37:14 -0000 1.28
+++ libgnomecanvas.spec 23 May 2006 18:32:13 -0000 1.29
@@ -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: 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 @@
%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 @@
%{_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 <mclasen at redhat.com> - 2.14.0-2
+- Fix multilib conflicts
+- Don't ship .la files
+- Some spec file cleanups
+
* Mon Mar 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-1
- Update to 2.14.0
- Previous message (by thread): rpms/xorg-x11-server/devel .cvsignore, 1.15, 1.16 sources, 1.12, 1.13 xorg-x11-server.spec, 1.60, 1.61 fb-fix-transforms.patch, 1.1, NONE
- Next message (by thread): rpms/libgnomecanvas/devel libgnomecanvas.spec,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list