From 3e6dfa93f9690fd39cad2218ff92304c4c6513e59eedbf8c50af21a7389a89b7 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 6 Apr 2011 07:40:36 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/gdl revision 25.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdl?expand=0&rev=cd533edc371a5cbab96d0314627512e0 --- gdl.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdl.spec b/gdl.spec index b90050b..f500a29 100644 --- a/gdl.spec +++ b/gdl.spec @@ -1,7 +1,7 @@ # -# spec file for package gdl (Version 2.30.1) +# spec file for package gdl # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ BuildRequires: translation-update-upstream License: LGPLv2.1+ Group: System/Libraries Version: 2.30.1 -Release: 1 +Release: 5 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 From 20e6110305fc6de485018bb5133aa5b37d03d880b805d0ec5051ac37b8751fee Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 22 Apr 2011 11:45:47 +0000 Subject: [PATCH 2/4] Accepting request 67369 from GNOME:Next thanks OBS-URL: https://build.opensuse.org/request/show/67369 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdl?expand=0&rev=47 --- gdl-2.30.1.tar.bz2 | 3 --- gdl-3.0.0.tar.bz2 | 3 +++ gdl-build-fix.patch | 26 -------------------------- gdl.changes | 36 ++++++++++++++++++++++++++++++++++++ gdl.spec | 39 ++++++++++++++++----------------------- 5 files changed, 55 insertions(+), 52 deletions(-) delete mode 100644 gdl-2.30.1.tar.bz2 create mode 100644 gdl-3.0.0.tar.bz2 delete mode 100644 gdl-build-fix.patch diff --git a/gdl-2.30.1.tar.bz2 b/gdl-2.30.1.tar.bz2 deleted file mode 100644 index df862ee..0000000 --- a/gdl-2.30.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:027dd1cd0191996fe1a0dc902da857698cc79564cb057ba13b09097e56e30cc1 -size 569211 diff --git a/gdl-3.0.0.tar.bz2 b/gdl-3.0.0.tar.bz2 new file mode 100644 index 0000000..d876f9b --- /dev/null +++ b/gdl-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b84b1ff4d798920ff04ba1f89f2e20468d706d9f4aab19d03241f32b16bec96 +size 585811 diff --git a/gdl-build-fix.patch b/gdl-build-fix.patch deleted file mode 100644 index af7e0e6..0000000 --- a/gdl-build-fix.patch +++ /dev/null @@ -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; diff --git a/gdl.changes b/gdl.changes index b93ca08..66a6436 100644 --- a/gdl.changes +++ b/gdl.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +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: + + Translation updates + + Build fixes +- 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 +- Update BuildRequires from gtk2-devel to + gtk3-devel/gobject-introspection-devel +- Drop gdl-build-fix.patch: fixed upstream. +- Update library package name to follow library soname change. + ------------------------------------------------------------------- Mon Mar 21 16:58:05 UTC 2011 - coolo@novell.com diff --git a/gdl.spec b/gdl.spec index f500a29..1c7b267 100644 --- a/gdl.spec +++ b/gdl.spec @@ -20,19 +20,18 @@ Name: gdl BuildRequires: fdupes -BuildRequires: gtk2-devel +BuildRequires: gtk3-devel +BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: libxml2-devel BuildRequires: translation-update-upstream License: LGPLv2.1+ Group: System/Libraries -Version: 2.30.1 -Release: 5 +Version: 3.0.0 +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: gtk2-devel libxml2-devel -Obsoletes: gdl-doc < 2.24.0 -Provides: gdl-doc = 2.24.0 +Requires: libgdl-3-1 = %{version} %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 From 58a8814de7517c36958edd9dc713f06a5ca0417ffa280901920082dff99900a0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 22 Apr 2011 11:48:15 +0000 Subject: [PATCH 3/4] Accepting request 68167 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/68167 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdl?expand=0&rev=48 --- gdl.changes | 13 ++++++++++--- gdl.spec | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gdl.changes b/gdl.changes index 66a6436..17e8522 100644 --- a/gdl.changes +++ b/gdl.changes @@ -5,8 +5,8 @@ Tue Apr 5 17:34:44 UTC 2011 - fcrozat@novell.com + Fix missing return values + Updated translations. - Changes from version 2.91.92: - + Translation updates + Build fixes + + Translation updates - Changes from version 2.91.90: + Translation updates - Changes from version 2.91.4: @@ -29,10 +29,17 @@ Tue Apr 5 17:34:44 UTC 2011 - fcrozat@novell.com + Depends on gtk+-3.0 now: - new library name libgdl3 - new pkg-config name gdl-3.0 -- Update BuildRequires from gtk2-devel to - gtk3-devel/gobject-introspection-devel - 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 diff --git a/gdl.spec b/gdl.spec index 1c7b267..9ad88a8 100644 --- a/gdl.spec +++ b/gdl.spec @@ -20,8 +20,8 @@ Name: gdl BuildRequires: fdupes -BuildRequires: gtk3-devel BuildRequires: gobject-introspection-devel +BuildRequires: gtk3-devel BuildRequires: intltool BuildRequires: libxml2-devel BuildRequires: translation-update-upstream From 8253a32a13d449628bf95da95ac570ebf54bd00bfbb38d2cd89c0fadac91fbdc Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 27 Apr 2011 13:32:14 +0000 Subject: [PATCH 4/4] Accepting request 68567 from home:fcrozat:branches:GNOME:Factory thanks OBS-URL: https://build.opensuse.org/request/show/68567 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdl?expand=0&rev=49 --- gdl-3.0.0.tar.bz2 | 3 --- gdl-3.0.1.tar.bz2 | 3 +++ gdl.changes | 7 +++++++ gdl.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 gdl-3.0.0.tar.bz2 create mode 100644 gdl-3.0.1.tar.bz2 diff --git a/gdl-3.0.0.tar.bz2 b/gdl-3.0.0.tar.bz2 deleted file mode 100644 index d876f9b..0000000 --- a/gdl-3.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b84b1ff4d798920ff04ba1f89f2e20468d706d9f4aab19d03241f32b16bec96 -size 585811 diff --git a/gdl-3.0.1.tar.bz2 b/gdl-3.0.1.tar.bz2 new file mode 100644 index 0000000..25d38a9 --- /dev/null +++ b/gdl-3.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0c3d855c7f8b115ec10f34db1291cb09db48a24281c3f9242d8348b189d5b09 +size 615616 diff --git a/gdl.changes b/gdl.changes index 17e8522..9d8ab62 100644 --- a/gdl.changes +++ b/gdl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/gdl.spec b/gdl.spec index 9ad88a8..006f001 100644 --- a/gdl.spec +++ b/gdl.spec @@ -27,7 +27,7 @@ BuildRequires: libxml2-devel BuildRequires: translation-update-upstream License: LGPLv2.1+ Group: System/Libraries -Version: 3.0.0 +Version: 3.0.1 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