Accepting request 69041 from GNOME:Factory

Pushing G:F (including GNOME3)

OBS-URL: https://build.opensuse.org/request/show/69041
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdl?expand=0&rev=26

gdl-2.30.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:027dd1cd0191996fe1a0dc902da857698cc79564cb057ba13b09097e56e30cc1
-size 569211

gdl-3.0.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0c3d855c7f8b115ec10f34db1291cb09db48a24281c3f9242d8348b189d5b09
+size 615616

gdl-build-fix.patch

@@ -1,26 +0,0 @@
-Index: gdl-2.29.2/gdl/gdl-dock-item-button-image.c
-===================================================================
---- gdl-2.29.2.orig/gdl/gdl-dock-item-button-image.c
-+++ gdl-2.29.2/gdl/gdl-dock-item-button-image.c
-@@ -49,7 +49,7 @@ gdl_dock_item_button_image_expose (GtkWi
-     cairo_set_line_width(cr, 1.0);
-     
-     style = gtk_widget_get_style (widget);
--    g_return_if_fail (style != NULL);
-+    g_return_val_if_fail (style != NULL, 0);
-     color = &style->fg[GTK_STATE_NORMAL];
-     cairo_set_source_rgba(cr, color->red / 65535.0,
-         color->green / 65535.0, color->blue / 65535.0, 0.55);
-Index: gdl-2.29.2/gdl/gdl-dock-item.c
-===================================================================
---- gdl-2.29.2.orig/gdl/gdl-dock-item.c
-+++ gdl-2.29.2/gdl/gdl-dock-item.c
-@@ -1816,7 +1816,7 @@ gdl_dock_item_set_tablabel (GdlDockItem
- GtkWidget *
- gdl_dock_item_get_grip(GdlDockItem *item)
- {
--    g_return_if_fail (item != NULL);
-+    g_return_val_if_fail (item != NULL, NULL);
-     g_return_val_if_fail (GDL_IS_DOCK_ITEM (item), NULL);
- 
-     return item->_priv->grip;

gdl.changes

@@ -1,3 +1,53 @@
+-------------------------------------------------------------------
+Wed Apr 27 13:16:25 UTC 2011 - fcrozat@novell.com
+
+- Update to version 3.0.1:
+  + Set GtkJunctionSides for GdlSwitcher toggle buttons.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Apr  5 17:34:44 UTC 2011 - fcrozat@novell.com
+
+- Update to version 3.0.0:
+  + Fix missing return values
+  + Updated translations.
+- Changes from version 2.91.92:
+  + Build fixes
+  + Translation updates
+- Changes from version 2.91.90:
+  + Translation updates
+- Changes from version 2.91.4:
+  + Fixed for latest gtk+
+- Changes from version 2.91.3:
+  + GIR build fixed for vala
+  + Use gtk_paned_new instead() of gtk_[h,v]paned_new()
+- Changes from version 2.91.2:
+  + bgo#633499: prepare for the demise of size_request
+  + Some smaller fixes for leftovers of the gtk+-3.0 transition
+- Changes from version 2.91.1:
+  + Ported to lastest gtk+ master:
+   - bgo#633049: Stop using GtkObject
+   - bgo#630841: Don't use deprecated GDK drawing APIs
+   - bgo#631070: Use upstream gettext instead the Glib one
+   - bgo#624636: Update to new GtkNotebook switch-page signal
+     signature.
+  + Due to new drawing API we have much nicer preview windows now.
+- Changes from version 2.90.0:
+  + Depends on gtk+-3.0 now:
+    - new library name libgdl3
+    - new pkg-config name gdl-3.0
+- Drop gdl-build-fix.patch: fixed upstream.
+- Update library package name to follow library soname change.
+- Change gtk2-devel BuildRequires to gtk3-devel.
+- Add gobject-introspection-devel BuildRequires to build
+  introspection support.
+- Remove explicit Requires of gtk2-devel and libxml2-devel in devel
+  subpackage: they will automatically be added the pkgconfig() way.
+- Remove Obsoletes for libgdl-1-0 as this is not needed anymore
+  with the soname change.
+- Remove Provides/Obsoletes for gdl-doc as this was long enough
+  ago.
+
 -------------------------------------------------------------------
 Mon Mar 21 16:58:05 UTC 2011 - coolo@novell.com
 

gdl.spec

@@ -20,19 +20,18 @@
 
 Name:           gdl
 BuildRequires:  fdupes
-BuildRequires:  gtk2-devel
+BuildRequires:  gobject-introspection-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  intltool
 BuildRequires:  libxml2-devel
 BuildRequires:  translation-update-upstream
 License:        LGPLv2.1+
 Group:          System/Libraries
-Version:        2.30.1
+Version:        3.0.1
-Release:        5
+Release:        1
 Summary:        Gnome Devtool Libraries contains components and libraries
 Source:         http://ftp.gnome.org/pub/GNOME/sources/gdl/2.24/%name-%version.tar.bz2
 Source1:        %{name}-rpmlintrc
-# PATCH-FIX-UPSTREAM gdl-build-fix.patch bgo603600 vuntz@opensuse.org -- Missing return values
-Patch0:         gdl-build-fix.patch
 Url:            http://ftp.gnome.org/pub/GNOME/sources/gdl/0.7/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -41,16 +40,15 @@ Gnome Devtool Libraries contains components and libraries that are
 intended to be shared between GNOME development tools, including
 gnome-debug, gnome-build, and anjuta2.
 
-%package -n libgdl-1-3
+%package -n libgdl-3-1
 License:        LGPLv2.1+
 Summary:        Gnome Devtool Libraries contains components and libraries
 Group:          System/Libraries
 Requires:       %{name}-lang = %{version}
 Obsoletes:      gdl < %{version}
 Provides:       gdl = %{version}
-Obsoletes:      libgdl-1-0 < 2.27.2
 
-%description -n libgdl-1-3
+%description -n libgdl-3-1
 Gnome Devtool Libraries contains components and libraries that are
 intended to be shared between GNOME development tools, including
 gnome-debug, gnome-build, and anjuta2.
@@ -59,10 +57,7 @@ gnome-debug, gnome-build, and anjuta2.
 License:        LGPLv2.1+
 Summary:        Gnome Devtool Libraries contains components and libraries
 Group:          System/Libraries
-Requires:       libgdl-1-3 = %{version}
+Requires:       libgdl-3-1 = %{version}
-Requires:       gtk2-devel libxml2-devel
-Obsoletes:      gdl-doc < 2.24.0
-Provides:       gdl-doc = 2.24.0
 
 %description devel
 Gnome Devtool Libraries contains components and libraries that are
@@ -73,44 +68,42 @@ gnome-debug, gnome-build, and anjuta2.
 %prep
 %setup -q
 translation-update-upstream
-%patch0 -p1
 
 %build
 %configure
-make %{?jobs:-j%jobs}
+make %{?jobs:-j%jobs} V=1
 
 %install 
 %makeinstall
-%if 0%{?suse_version} <= 1120
-%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
-%endif
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
-%find_lang %{name}-1
+%find_lang %{name}-3
 %fdupes -s $RPM_BUILD_ROOT
 
-%post -n libgdl-1-3 -p /sbin/ldconfig
+%post -n libgdl-3-1 -p /sbin/ldconfig
 
-%postun -n libgdl-1-3 -p /sbin/ldconfig
+%postun -n libgdl-3-1 -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -n libgdl-1-3
+%files -n libgdl-3-1
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_datadir}/gdl
+%{_datadir}/gdl-3
 %{_libdir}/*.so.*
+%{_libdir}/girepository-1.0/Gdl-3.typelib
 
 %files devel
 %defattr(-, root, root)
 %{_includedir}/libgdl*
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
+%{_datadir}/gir-1.0/Gdl-3.gir
 # Own these repositories to not depend on gtk-doc while building:
 %dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/*
 
-%files lang -f %{name}-1.lang
+%files lang -f %{name}-3.lang
 
 %changelog