From b916dece880907b2bdc694cf137216a6b4173f74a838b2b3d61be45fd570c740 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Feb 2010 15:29:17 +0000 Subject: [PATCH] converted link to branch OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdl?expand=0&rev=38 --- gdl-2.28.0.tar.bz2 | 3 --- gdl-2.29.2.tar.bz2 | 3 +++ gdl-build-fix.patch | 26 ++++++++++++++++++++++++++ gdl.changes | 16 ++++++++++++++++ gdl.spec | 20 +++++++++++++------- 5 files changed, 58 insertions(+), 10 deletions(-) delete mode 100644 gdl-2.28.0.tar.bz2 create mode 100644 gdl-2.29.2.tar.bz2 create mode 100644 gdl-build-fix.patch diff --git a/gdl-2.28.0.tar.bz2 b/gdl-2.28.0.tar.bz2 deleted file mode 100644 index e2f8fdf..0000000 --- a/gdl-2.28.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcb6c5ac12c73c97d3e865bd8477456be7c4b1459c43af53010d3f1867c3e48e -size 539257 diff --git a/gdl-2.29.2.tar.bz2 b/gdl-2.29.2.tar.bz2 new file mode 100644 index 0000000..28d21b7 --- /dev/null +++ b/gdl-2.29.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdae3aaf2ab1b98c3bce393de341c141cfce130655f60f49ec5cf8310256bc7b +size 541861 diff --git a/gdl-build-fix.patch b/gdl-build-fix.patch new file mode 100644 index 0000000..af7e0e6 --- /dev/null +++ b/gdl-build-fix.patch @@ -0,0 +1,26 @@ +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; diff --git a/gdl.changes b/gdl.changes index a3aa667..e3927f3 100644 --- a/gdl.changes +++ b/gdl.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Dec 2 13:51:16 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.2: + + Add a "selected" signal to GdlDockItem + + Don't make dock windows transistent, there is no need to do so + (bgo#570263) + + bgo#583984 - Build warning about no return value + +------------------------------------------------------------------- +Sat Nov 14 02:31:02 CET 2009 - vuntz@opensuse.org + +- Update to version 2.28.1: + + Updated translations. +- Fix rpmlint warnings about self-obsoletion. + ------------------------------------------------------------------- Thu Oct 1 14:50:19 CEST 2009 - dimstar@opensuse.org diff --git a/gdl.spec b/gdl.spec index 3c9b090..26b24f6 100644 --- a/gdl.spec +++ b/gdl.spec @@ -1,5 +1,5 @@ # -# spec file for package gdl (Version 2.28.0) +# spec file for package gdl (Version 2.29.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,13 +25,15 @@ BuildRequires: intltool BuildRequires: libxml2-devel BuildRequires: licenses BuildRequires: translation-update-upstream -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: System/Libraries -Version: 2.28.0 +Version: 2.29.2 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,11 +43,11 @@ intended to be shared between GNOME development tools, including gnome-debug, gnome-build, and anjuta2. %package -n libgdl-1-3 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Gnome Devtool Libraries contains components and libraries Group: System/Libraries Requires: %{name}-lang = %{version} -Obsoletes: gdl <= %{version} +Obsoletes: gdl < %{version} Provides: gdl = %{version} Obsoletes: libgdl-1-0 < 2.27.2 @@ -55,12 +57,12 @@ intended to be shared between GNOME development tools, including gnome-debug, gnome-build, and anjuta2. %package devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Gnome Devtool Libraries contains components and libraries Group: System/Libraries Requires: libgdl-1-3 = %{version} Requires: gtk2-devel libxml2-devel -Obsoletes: gdl-doc <= 2.24.0 +Obsoletes: gdl-doc < 2.24.0 Provides: gdl-doc = 2.24.0 %description devel @@ -72,6 +74,7 @@ gnome-debug, gnome-build, and anjuta2. %prep %setup -q translation-update-upstream +%patch0 -p1 %build %configure @@ -79,6 +82,9 @@ make %{?jobs:-j%jobs} %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 %fdupes -s $RPM_BUILD_ROOT