From 95a068572432e55c5474b66ee4c8288813c68955acac68a2b8ee2c69fe00b9e1 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Thu, 26 Apr 2012 09:12:14 +0000 Subject: [PATCH 1/4] Accepting request 115621 from X11:xfce:UNSTABLE merge from X11:xfce:UNSTABLE OBS-URL: https://build.opensuse.org/request/show/115621 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=33 --- libxfce4ui-4.8.1.tar.bz2 | 3 --- libxfce4ui-4.9.2.tar.bz2 | 3 +++ libxfce4ui-fix-shortcut-handling.patch | 30 --------------------- libxfce4ui.changes | 32 ++++++++++++++++++++++ libxfce4ui.spec | 37 +++++++++++++++++++++----- 5 files changed, 65 insertions(+), 40 deletions(-) delete mode 100644 libxfce4ui-4.8.1.tar.bz2 create mode 100644 libxfce4ui-4.9.2.tar.bz2 delete mode 100644 libxfce4ui-fix-shortcut-handling.patch diff --git a/libxfce4ui-4.8.1.tar.bz2 b/libxfce4ui-4.8.1.tar.bz2 deleted file mode 100644 index c32c4bd..0000000 --- a/libxfce4ui-4.8.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39cbed29da06960074014b74abc2ba57db49dc81ab8995fb2160579c51669956 -size 426831 diff --git a/libxfce4ui-4.9.2.tar.bz2 b/libxfce4ui-4.9.2.tar.bz2 new file mode 100644 index 0000000..b5fb9b4 --- /dev/null +++ b/libxfce4ui-4.9.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95978b535c0ee55012910b0b2202535f2785c8b15782e94b75ad12d06c889c3e +size 542174 diff --git a/libxfce4ui-fix-shortcut-handling.patch b/libxfce4ui-fix-shortcut-handling.patch deleted file mode 100644 index 890f3e8..0000000 --- a/libxfce4ui-fix-shortcut-handling.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- libxfce4ui-4.8.0/libxfce4kbd-private/xfce-shortcuts-grabber.c 2011-01-16 10:01:09.000000000 -0500 -+++ hacked/libxfce4kbd-private/xfce-shortcuts-grabber.c 2011-12-18 00:29:58.343552611 -0500 -@@ -560,6 +560,9 @@ - { - gchar *name; - gboolean result = FALSE; -+ guint keycode; -+ guint modifiers; -+ gchar *shortcut2; - - g_return_val_if_fail (context != NULL, TRUE); - g_return_val_if_fail (context->xevent != NULL, TRUE); -@@ -569,13 +572,16 @@ - name = xfce_shortcuts_grabber_shortcut_name (context->grabber, context->xevent->keycode, - context->xevent->state); - -- if (G_UNLIKELY (g_str_equal (shortcut, name))) -+ xfce_shortcuts_grabber_parse_shortcut (context->grabber, shortcut, &keycode, &modifiers); -+ shortcut2 = xfce_shortcuts_grabber_shortcut_name (context->grabber, keycode, modifiers); -+ if (G_UNLIKELY (g_str_equal (shortcut2, name))) - { - context->result = shortcut; - result = TRUE; - } - - g_free (name); -+ g_free (shortcut2); - - gdk_flush (); - gdk_error_trap_pop (); diff --git a/libxfce4ui.changes b/libxfce4ui.changes index 9470d3d..25c93d1 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Sat Apr 14 09:33:39 UTC 2012 - gber@opensuse.org + +- update to version 4.9.2 + - increase gtk and glib versions + - bump 4util dependency + - remove unused function prototype + - translation updates + +------------------------------------------------------------------- +Sun Apr 8 09:40:57 UTC 2012 - gber@opensuse.org + +- update to version 4.9.1 + - open docs.xfce.org when Help in xfce4-about is clicked + - cache header icons and avoid large icons in XfceTitledDialog + - restore glade directory information in .pc file + - update translator credits + - a lot of improvements in the shortcuts code + - add Alt + F1 as a shortcut for applications menu + - remove unused code from the internal header widget + - add xfce4-about from xfce-utils package + - use xdt-csource instead of exo-csource, depend on xdt 4.9.0 + - update to new xfce4-appfinder commands + - fix build against 3.9 Glade + - add shortcuts for XF86WWW and XF86Mail + - simplify the xfce_gdk_screen_get_active fucntion + - add xfce_dialog_show_help function + - translation updates +- dropped libxfce4ui-fix-shortcut-handling.patch which is not + applicable any more +- split off -tools subpackage + ------------------------------------------------------------------- Sat Mar 31 16:54:23 UTC 2012 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 9779409..a604889 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -19,17 +19,16 @@ %define libname libxfce4ui-1-0 Name: libxfce4ui -Version: 4.8.1 +Version: 4.9.2 Release: 0 Summary: Widgets Library for the Xfce Desktop Environment License: LGPL-2.1+ Group: System/Libraries Url: http://www.xfce.org/ -Source0: http://archive.xfce.org/src/xfce/libxfce4ui/4.8/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM libxfce4ui-fix-shortcut-handling.patch rh#768704 gber@opensuse.org -- Normalizes string representation of keyboard shortcuts before comparing them in the libxfce4kbd-private shortcut matching code -Patch0: libxfce4ui-fix-shortcut-handling.patch +Source0: http://archive.xfce.org/src/xfce/libxfce4ui/4.9/%{name}-%{version}.tar.bz2 BuildRequires: gtk-doc BuildRequires: intltool +BuildRequires: update-desktop-files BuildRequires: pkgconfig(gladeui-1.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gtk+-2.0) @@ -49,14 +48,22 @@ License: LGPL-2.1+ Group: System/Libraries # -branding is not really a dependency but it must be dragged in at a low level Recommends: %{name}-branding = %{version} -Provides: %{name} = %{version} -Obsoletes: %{name} <= 4.8.1 +Provides: libxfce4ui = %{version} +Obsoletes: libxfce4ui <= 4.8.1 Recommends: %{name}-lang = %{version} %description -n %{libname} The libxfce4ui library provides a number of widgets commonly used by Xfce applications. +%package tools +Summary: Tools from libxfce4ui +License: LGPL-2.1+ +Group: System/GUI/XFCE + +%description tools +This package provides tools from libxfce4ui. + %package -n glade3-catalog-libxfce4ui Summary: Glade Catalog for libxfce4ui License: LGPL-2.1+ @@ -118,12 +125,12 @@ Provides translations to the package %{name} %prep %setup -q -%patch0 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" %configure \ --enable-startup-notification \ + --with-vendor-info=openSUSE \ --enable-gtk-doc \ --disable-static make %{?_smp_mflags} V=1 @@ -135,6 +142,8 @@ rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/libglade/2.0/*.la rm -f %{buildroot}%{_libdir}/glade3/modules/*.la +%suse_update_desktop_file xfce4-about -r X-XFCE X-Xfce-Toplevel + # remove unsupported locales rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} @@ -147,6 +156,14 @@ rm -rf %{buildroot} %postun -n %{libname} -p /sbin/ldconfig +%post tools +%desktop_database_post +%icon_theme_cache_post + +%postun tools +%desktop_database_postun +%icon_theme_cache_postun + %files -n %{libname} %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO @@ -172,6 +189,12 @@ rm -rf %{buildroot} %dir %{_includedir}/xfce4/libxfce4kbd-private-2 %{_includedir}/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/ +%files tools +%defattr(-, root, root) +%{_bindir}/xfce4-about +%{_datadir}/applications/xfce4-about.desktop +%{_datadir}/icons/hicolor/48x48/apps/xfce4-logo.png + %files doc %defattr(-, root, root) %doc %{_datadir}/gtk-doc/html/libxfce4ui/ From 95375fdcf89830cab44ec60eb0f320fd0a93a78677232dc259245b46114856a1 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Fri, 27 Apr 2012 10:41:04 +0000 Subject: [PATCH 2/4] clarify comment OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=34 --- libxfce4ui.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libxfce4ui.spec b/libxfce4ui.spec index a604889..9a32644 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -46,7 +46,8 @@ applications. Summary: Widgets Library for the Xfce Desktop Environment License: LGPL-2.1+ Group: System/Libraries -# -branding is not really a dependency but it must be dragged in at a low level +# -branding only contains keyboard shortcuts for some libxfce4ui consumers so +# it is not really a dependency but it must be dragged in at a low level Recommends: %{name}-branding = %{version} Provides: libxfce4ui = %{version} Obsoletes: libxfce4ui <= 4.8.1 From 2fabcf9f83d437e5f3d3a3b5ddb9dc76ace684d2d9248a8928b865ea0b3588b2 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Sun, 29 Apr 2012 14:51:23 +0000 Subject: [PATCH 3/4] Accepting request 115943 from X11:xfce:UNSTABLE merge back Xfce 4.10 OBS-URL: https://build.opensuse.org/request/show/115943 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=35 --- libxfce4ui-4.10.0.tar.bz2 | 3 +++ libxfce4ui-4.9.2.tar.bz2 | 3 --- libxfce4ui.changes | 9 +++++++++ libxfce4ui.spec | 6 ++++-- 4 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 libxfce4ui-4.10.0.tar.bz2 delete mode 100644 libxfce4ui-4.9.2.tar.bz2 diff --git a/libxfce4ui-4.10.0.tar.bz2 b/libxfce4ui-4.10.0.tar.bz2 new file mode 100644 index 0000000..f06c13a --- /dev/null +++ b/libxfce4ui-4.10.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2 +size 545486 diff --git a/libxfce4ui-4.9.2.tar.bz2 b/libxfce4ui-4.9.2.tar.bz2 deleted file mode 100644 index b5fb9b4..0000000 --- a/libxfce4ui-4.9.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95978b535c0ee55012910b0b2202535f2785c8b15782e94b75ad12d06c889c3e -size 542174 diff --git a/libxfce4ui.changes b/libxfce4ui.changes index 25c93d1..be7977c 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Apr 29 07:47:13 UTC 2012 - gber@opensuse.org + +- update to version 4.10.0 + - update contributor credits + - enable startup notification in xfce4-appfinder shortcuts + - translation updates +- make libxfce4ui-1-0 depend on exo-tools, it uses exo-open + ------------------------------------------------------------------- Sat Apr 14 09:33:39 UTC 2012 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 9a32644..d9c2cc6 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -19,13 +19,13 @@ %define libname libxfce4ui-1-0 Name: libxfce4ui -Version: 4.9.2 +Version: 4.10.0 Release: 0 Summary: Widgets Library for the Xfce Desktop Environment License: LGPL-2.1+ Group: System/Libraries Url: http://www.xfce.org/ -Source0: http://archive.xfce.org/src/xfce/libxfce4ui/4.9/%{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/xfce/libxfce4ui/4.10/%{name}-%{version}.tar.bz2 BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: update-desktop-files @@ -46,6 +46,8 @@ applications. Summary: Widgets Library for the Xfce Desktop Environment License: LGPL-2.1+ Group: System/Libraries +# uses exo-open +Requires: exo-tools # -branding only contains keyboard shortcuts for some libxfce4ui consumers so # it is not really a dependency but it must be dragged in at a low level Recommends: %{name}-branding = %{version} From 453861987d65be18600110b4cc59bc2ba27b05e9b6d03cd5b208e9a5c277bc6e Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Thu, 3 May 2012 11:51:09 +0000 Subject: [PATCH 4/4] - fix license of libxfce4ui-tools (bnc#760492) OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=36 --- libxfce4ui.changes | 5 +++++ libxfce4ui.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libxfce4ui.changes b/libxfce4ui.changes index be7977c..0044ec3 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 3 11:50:35 UTC 2012 - gber@opensuse.org + +- fix license of libxfce4ui-tools (bnc#760492) + ------------------------------------------------------------------- Sun Apr 29 07:47:13 UTC 2012 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index d9c2cc6..6babe4b 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -61,7 +61,7 @@ applications. %package tools Summary: Tools from libxfce4ui -License: LGPL-2.1+ +License: GPL-2.0+ Group: System/GUI/XFCE %description tools