[libgdl] Fix multilib conflicts in -devel subpackage

Kalev Lember kalev at fedoraproject.org
Thu Jun 28 12:43:04 UTC 2012


commit df4725031d1a033f78e649fbae7a046bd4069753
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Thu Jun 28 15:07:21 2012 +0300

    Fix multilib conflicts in -devel subpackage
    
    Avoid passing --enable-gtk-doc so that we use use prebuilt html docs
    from the tarball, instead of rebuilding them every time.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=831409

 libgdl.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/libgdl.spec b/libgdl.spec
index cf4d8f7..10d872f 100644
--- a/libgdl.spec
+++ b/libgdl.spec
@@ -1,7 +1,7 @@
 Summary:	GNOME docking library
 Name:		libgdl
 Version:	3.5.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		Development/Libraries
@@ -42,7 +42,9 @@ This package contains development files for %{name}.
 %patch0 -p1
 
 %build
-%configure --disable-silent-rules --disable-static --enable-gtk-doc \
+%configure \
+  --disable-silent-rules \
+  --disable-static \
   --enable-introspection=yes
 
 # Omit unused direct shared library dependencies.
@@ -82,6 +84,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 %{_includedir}/%{name}-3.0/gdl
 
 %changelog
+* Thu Jun 28 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.5.3-2
+- Fix multilib conflicts in -devel by using html docs from the tarball,
+  instead of rebuilding them every time (#831409)
+
 * Thu Jun 28 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.5.3-1
 - Update to 3.5.3
 - Sync summary and description from doap file


More information about the scm-commits mailing list