Hello community,

here is the log from the commit of package glade for openSUSE:Factory checked 
in at 2012-01-09 12:04:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glade (Old)
 and      /work/SRC/openSUSE:Factory/.glade.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "glade", Maintainer is "gnome-maintain...@suse.de"

Changes:
--------
--- /work/SRC/openSUSE:Factory/glade/glade.changes      2011-10-13 
12:28:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.glade.new/glade.changes 2012-01-09 
12:04:29.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Dec 21 08:19:18 UTC 2011 - vu...@opensuse.org
+
+- Add glade-explicit-gmodule.patch: explicitly link to
+  gmodule-2.0, to fix build with latest glib.
+- Split typelib files into typelib-1_0-Gladeui-2_0 subpackage.
+- Add typelib-1_0-Gladeui-2_0 Requires to devel subpackage.
+
+-------------------------------------------------------------------

New:
----
  glade-explicit-gmodule.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ glade.spec ++++++
--- /var/tmp/diff_new_pack.On1ayK/_old  2012-01-09 12:04:31.000000000 +0100
+++ /var/tmp/diff_new_pack.On1ayK/_new  2012-01-09 12:04:31.000000000 +0100
@@ -15,12 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           glade
 Version:        3.10.2
-Release:        1
+Release:        0
 Summary:        User Interface Builder for GTK+
 License:        GPL-2.0+
 Group:          Development/Tools/GUI Builders
@@ -28,8 +26,10 @@
 Source:         
http://download.gnome.org/sources/glade/3.10/%{name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM glade-pygobject-3.0.patch vu...@opensuse.org -- Port to 
pygobject 3.0
 Patch0:         glade-pygobject-3.0.patch
+# PATCH-FIX-UPSTREAM glade-explicit-gmodule.patch bgo#665784 
vu...@opensuse.org -- Explicitly link to gmodule-2.0
+Patch1:         glade-explicit-gmodule.patch
 BuildRequires:  fdupes
-# needed for patch0
+# needed for patch0 and patch1
 BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gobject-introspection-devel
@@ -47,7 +47,6 @@
 interfaces for the Gtk+ toolkit and the GNOME desktop environment.
 
 %package -n libgladeui-2-0
-License:        GPL-2.0+
 Summary:        User Interface Builder for GTK+
 Group:          Development/Tools/GUI Builders
 Recommends:     %{name}-lang
@@ -56,11 +55,22 @@
 Glade is a RAD tool to enable quick & easy development of user
 interfaces for the Gtk+ toolkit and the GNOME desktop environment.
 
+%package -n typelib-1_0-Gladeui-2_0
+Summary:        User Interface Builder for GTK+ -- Introspection bindings
+Group:          Development/Tools/GUI Builders
+
+%description -n typelib-1_0-Gladeui-2_0
+Glade is a RAD tool to enable quick & easy development of user
+interfaces for the Gtk+ toolkit and the GNOME desktop environment.
+
+This package provides the GObject Introspection bindings for the
+libgladeui library.
+
 %package -n libgladeui-2-devel
-License:        GPL-2.0+
 Summary:        User Interface Builder for GTK+ -- Development Files
 Group:          Development/Libraries/C and C++
 Requires:       libgladeui-2-0 = %{version}
+Requires:       typelib-1_0-Gladeui-2_0 = %{version}
 # The gtk-doc documentation is not parallel installable (bnc#646997)
 Conflicts:      libgladeui-1-devel
 
@@ -72,9 +82,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-# needed for patch0
+# needed for patch0 and patch1
 NOCONFIGURE=1 gnome-autogen.sh
 %configure --disable-static --with-pic\
        --disable-scrollkeeper
@@ -124,7 +135,6 @@
 %files -n libgladeui-2-0
 %defattr (-, root, root)
 %{_libdir}/libgladeui*.so.*
-%{_libdir}/girepository-1.0/Gladeui-2.0.typelib
 # These directories are needed by third-party catalogs, and are explicitly
 # referenced in the pkg-config file, so it makes sense to own them here
 %dir %{_datadir}/glade
@@ -136,6 +146,10 @@
 %dir %{_libdir}/glade
 %dir %{_libdir}/glade/modules
 
+%files -n typelib-1_0-Gladeui-2_0
+%defattr (-, root, root)
+%{_libdir}/girepository-1.0/Gladeui-2.0.typelib
+
 %files -n libgladeui-2-devel
 %defattr (-, root, root)
 %{_includedir}/libgladeui-2.0/

++++++ glade-explicit-gmodule.patch ++++++
commit 5f9bdd8407675dd9c03584f6d131d97dc4d7736c
Author: Vincent Untz <vu...@gnome.org>
Date:   Wed Dec 21 09:25:16 2011 +0100

    build: Explicitly link to gmodule-2.0
    
    https://bugzilla.gnome.org/show_bug.cgi?id=665784

diff --git a/configure.ac b/configure.ac
index 9652f71..52894d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,7 @@ dnl 
================================================================
 GTK_REQUIRED=3.0.2
 PKG_CHECK_MODULES([GTK],[
   gtk+-3.0 >= $GTK_REQUIRED
+  gmodule-2.0
   libxml-2.0 >= 2.4.0
 ])
 
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to