Attachment 571730 Details for Bug 718404 – rebased fix

[patch] rebased fix

0001-2.31.22-2.patch (text/plain), 3.36 KB, created by Alon Levy on 2012-03-21 14:35:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alon Levy

Created: 2012-03-21 14:35:24 UTC

Size: 3.36 KB

patch

obsolete

>From d47008190838e030dcf31c6a1b248a2d79eadabd Mon Sep 17 00:00:00 2001
>From: Alon Levy <alevy@redhat.com>
>Date: Wed, 21 Mar 2012 16:04:38 +0200
>Subject: [PATCH] 2.31.22-2
>
>Fix 718404
>---
> glib2.spec |   43 +++++++++++++++++++++++++++++--------------
> 1 file changed, 29 insertions(+), 14 deletions(-)
>
>diff --git a/glib2.spec b/glib2.spec
>index 00bd91e..9de346a 100644
>--- a/glib2.spec
>+++ b/glib2.spec
>@@ -1,7 +1,7 @@
> Summary: A library of handy utility functions
> Name: glib2
> Version: 2.31.22
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> License: LGPLv2+
> Group: System Environment/Libraries
> URL: http://www.gtk.org
>@@ -34,15 +34,23 @@ such as GTK+ and GNOME. It provides data structure handling for C,
> portability wrappers, and interfaces for such runtime functionality
> as an event loop, threads, dynamic loading, and an object system.
> 
>+%package devel-common
>+Summary: Common arch undependant file for gtk library
>+Group: Development/Libraries
>+BuildArch: noarch
> 
> %package devel
> Summary: A library of handy utility functions
> Group: Development/Libraries
> Requires: %{name} = %{version}-%{release}
>+Requires: %{name}-devel-common = %{version}-%{release}
> 
> %description devel
> The glib2-devel package includes the header files for the GLib library.
> 
>+%description devel-common
>+The glib2-devel-common provides commun files needed by glib2-devel
>+package and undependant of arch.
> 
> # anaconda needs static libs, see RH bug #193143
> %package static
>@@ -126,22 +134,31 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
> %{_includedir}/*
> %{_datadir}/aclocal/*
> %{_libdir}/pkgconfig/*
>-%{_datadir}/glib-2.0/gdb
>-%{_datadir}/glib-2.0/gettext
>-%{_datadir}/glib-2.0/schemas/gschema.dtd
>-%{_sysconfdir}/bash_completion.d/gresource-bash-completion.sh
>-# %{_datadir}/glib-2.0/gdb/*.pyo
>-# %{_datadir}/glib-2.0/gdb/*.pyc
> %{_bindir}/glib-genmarshal
> %{_bindir}/glib-gettextize
> %{_bindir}/glib-mkenums
> %{_bindir}/gobject-query
> %{_bindir}/gtester
>-%{_bindir}/gdbus-codegen
> %{_bindir}/glib-compile-resources
> %{_bindir}/gresource
> %{_libdir}/gdbus-2.0/codegen
> %attr (0755, root, root) %{_bindir}/gtester-report
>+%{_datadir}/gdb/auto-load%{_libdir}/libglib-2.0.so.*-gdb.py*
>+%{_datadir}/gdb/auto-load%{_libdir}/libgobject-2.0.so.*-gdb.py*
>+
>+%files static
>+%{_libdir}/lib*.a
>+
>+%files devel-common
>+# python script
>+%{_bindir}/gdbus-codegen
>+%{_datadir}/glib-2.0/gdb
>+%{_datadir}/glib-2.0/gettext
>+%{_datadir}/glib-2.0/schemas/gschema.dtd
>+%{_datadir}/systemtap/tapset/*.stp
>+%{_sysconfdir}/bash_completion.d/gresource-bash-completion.sh
>+#%{_datadir}/glib-2.0/gdb/*.pyo
>+#%{_datadir}/glib-2.0/gdb/*.pyc
> %doc %{_datadir}/gtk-doc/html/*
> %doc %{_mandir}/man1/glib-genmarshal.1.gz
> %doc %{_mandir}/man1/glib-gettextize.1.gz
>@@ -152,14 +169,12 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
> %doc %{_mandir}/man1/gdbus-codegen.1.gz
> %doc %{_mandir}/man1/glib-compile-resources.1.gz
> %doc %{_mandir}/man1/gresource.1.gz
>-%{_datadir}/gdb/auto-load%{_libdir}/libglib-2.0.so.*-gdb.py*
>-%{_datadir}/gdb/auto-load%{_libdir}/libgobject-2.0.so.*-gdb.py*
>-%{_datadir}/systemtap/tapset/*.stp
>-
>-%files static
>-%{_libdir}/lib*.a
> 
> %changelog
>+* Wed Mar 21 2012 Lameire Alexis <alexises@fedoraproject.org> - 2.31.22-2
>+- separate common dev file in devel-common package
>+  to prevent conflict bitween multi arch install. (#718404)
>+
> * Tue Mar 20 2012 Kalev Lember <kalevlember@gmail.com> 2.31.22-1
> - Update to 2.31.22
> 
>-- 
>1.7.9.3
>

Flags:

walters: review-

Actions: View | Diff

Attachments on bug 718404: 513368 | 571730 | 574199 | 574201 | 596788 | 1103971