[libchamplain] Fix a -devel multilib conflict

Kalev Lember kalev at fedoraproject.org
Wed Jul 2 13:48:16 UTC 2014


commit 2f67dcf6637195f307de718c53a832b3196d23d8
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Jul 2 15:31:39 2014 +0200

    Fix a -devel multilib conflict
    
    Use the html docs shipped in the tarball, instead of rebuilding them.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=565676

 libchamplain.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libchamplain.spec b/libchamplain.spec
index 1f3e37f..e906e62 100644
--- a/libchamplain.spec
+++ b/libchamplain.spec
@@ -15,7 +15,6 @@ BuildRequires:	clutter-gtk-devel
 BuildRequires:	libsoup-devel
 BuildRequires:	sqlite-devel
 BuildRequires:	gtk3-devel
-BuildRequires:	gtk-doc
 BuildRequires:	vala-devel
 BuildRequires:	vala-tools
 
@@ -75,7 +74,7 @@ This package contains demos for development using %{name}.
 
 %build
 %configure --disable-debug --disable-silent-rules --disable-static \
-  --enable-gtk --enable-gtk-doc --enable-introspection=yes --enable-vala \
+  --enable-gtk --enable-introspection=yes --enable-vala \
   --enable-vala-demos
 
 # Omit unused direct shared library dependencies.
@@ -138,6 +137,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-gtk-*.so.*
 * Wed Jul 02 2014 Kalev Lember <kalevlember at gmail.com> - 0.12.8-1
 - Update to 0.12.8
 - Drop upstreamed patches
+- Fix a -devel multilib conflict (#565676)
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild


More information about the scm-commits mailing list