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

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

libxfce4ui-4.9.2.tar.bz2

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

libxfce4ui-fix-shortcut-handling.patch

@@ -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 ();

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
 

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
+Source0:        http://archive.xfce.org/src/xfce/libxfce4ui/4.9/%{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
 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}
+Provides:       libxfce4ui = %{version}
-Obsoletes:      %{name} <= 4.8.1
+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/