diff --git a/_service b/_service
new file mode 100644
index 0000000..3cd489c
--- /dev/null
+++ b/_service
@@ -0,0 +1,17 @@
+
+
+
+ https://git.xfce.org/xfce/libxfce4ui/
+ git
+ @PARENT_TAG@+git@TAG_OFFSET@.%h
+ enable
+ maurizio.galli@gmail.com
+ libxfce4ui(.*)
+
+
+
+
+ xz
+ *.tar
+
+
diff --git a/libxfce4ui-4.12.1.tar.bz2 b/libxfce4ui-4.12.1.tar.bz2
deleted file mode 100644
index b2e9ce5..0000000
--- a/libxfce4ui-4.12.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43
-size 665624
diff --git a/libxfce4ui-4.14.1.tar.bz2 b/libxfce4ui-4.14.1.tar.bz2
new file mode 100644
index 0000000..8c1d724
--- /dev/null
+++ b/libxfce4ui-4.14.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c449075eaeae4d1138d22eeed3d2ad7032b87fb8878eada9b770325bed87f2da
+size 756175
diff --git a/libxfce4ui.changes b/libxfce4ui.changes
index c040206..f1e935c 100644
--- a/libxfce4ui.changes
+++ b/libxfce4ui.changes
@@ -1,9 +1,113 @@
-------------------------------------------------------------------
-Mon Jul 22 16:47:06 UTC 2019 - Scott Bahling
+Sun Aug 11 21:09:46 UTC 2019 - Maurizio Galli
-- Remove pkgconfig(gladeui-1.0) BuildRequires and
- glade3-catalog-libxfce4ui subpackage to enable building against
- SLE 12 targets. Nothing provides gladeui-1.0 with SLE 12.
+- Update to version 4.14.1
+ * No changes, re release because 4.14.0 tarball was broken
+- Changes from 4.14.0
+ * Do not try to a set button' image if an empty string was used
+ * Translation Updates
+- Cleaned up spec file
+
+-------------------------------------------------------------------
+Sun Jul 28 15:06:52 UTC 2019 - Maurizio Galli
+
+- Update to version 4.13.7
+ * Translations Updates
+
+-------------------------------------------------------------------
+Sun Jun 30 22:13:39 UTC 2019 - Marcel Kuehlhorn
+
+- Update to version 4.13.6
+ * Update active contributors
+ * Translation Updates
+
+-------------------------------------------------------------------
+Fri May 17 18:47:33 UTC 2019 - Maurizio Galli
+
+- Update to version 4.14.5
+ * Add PrintScreen as shortcut for xfce4-screenshooter (bxo#14524)
+ * Add Ctrl + Alt + t as default shortcut for terminal (bxo#14510)
+ * Add xfce_gdk_screen_get_geometry (a replacement for
+ gdk_screen_width/gdk_screen_height)
+ * Remove useless glade_*dir variables from libxfce4ui-{1,2}.pc
+ (bxo#13945)
+ * Fix release tarball by adding libxfce4ui-dialog-ui.ui
+ * Fixes for gladeui2 detection
+ * Install icons when gladeui2 is set (bxo#15207)
+ * Fix build error with --disable-gtk2 and having gladeui-1.0 installed
+ * Remove styling of emails in about dialog (bxo#14638)
+ * Fix compiler error -Wcast-function-type (GCC 8)
+ * Use https://docs.xfce.org for help url
+ * Fix compilation warnings ""defined" may not be portable"
+ & Update xfce4-about (core contributors, contributors, translators)
+ * Translation Updates
+- Added conditional for source section for when building with
+ git master sources.
+
+-------------------------------------------------------------------
+Sat Apr 27 12:19:22 UTC 2019 - Maurizio Galli
+
+- Update to version 4.13.4
+ * Fix missing gresource file in release tarball (bxo#13705)
+ * Add Vala support (Vidar Haarr)
+ * Fix gladeui2 path detection (bxo#13944)
+ * Fix make distcheck (bxo#14039)
+ * Fix incorrect use of AC_ARG_ENABLE(tests..) (bxo#13703)
+ * Use BOOLEAN instead of deprecated BOOL
+ * Allows to properly show some characters, such as ampersand (bxo#12715)
+ * Translation Updates
+- Changes from 4.13.3
+ * Fix make distcheck with gladeui2 install path
+ * Add an --enable-tests option
+ * Remove the filterout from introspection sources
+ * Move gresource building out of maintainer mode
+ * Fix condition in confirm dialog
+ * Add POTFILES.skip to appease gmake distcheck gods on OpenBSD
+ * Ship libxfce4ui.gresource.xml in the tarball too
+ * Add libxfce4ui-marshal.list to EXTRA_DIST to fix
+ --enable-maintainer-mode on released tarballs
+ * Fix build error with --disable-gtk2
+ * Translation updates
+- Changes from 4.13.2
+ * Fix build error with --disable-gtk3 bxo#12648
+ * Improve layout of labels in xfce dialogs
+ * Set a reasonable default window width to make sure labels wrap
+ * Improve vertical alignment of primary and secondary label
+ * Bump the default dialog width to 500px
+ * Update libxfce4ui documentation
+ * Fix make docs compilation warning
+ * Fix xfce_dialog_show_help(_with_version) doc
+ * Remove Makefile.am space to fix autogen.sh warning
+ * Better documentation processing
+ * Change xfce_dialog_show_help(_with_version)
+ * Default debxoto yes instead of full
+ * Remove exo dependancy bxo#13326
+ * fix: add libxfce4ui_get_resource to abi check symbols bxo#13326
+ * Let autotools find and invoke glib-compile-resources bxo#13326
+ * Add support for GOBJECT-INTROSPECTION bxo#13461
+ * Add GtkDoc checks
+ * Add missing introspection.m4 file
+ * fix: make distcheck
+ * fix: remove deprecation warnings
+ * feat: Switch to Gtk3 default, Gtk2 Optional
+ * Rename introspection GIR to 4ui-2.0 to match util
+ * Translation updates
+- Changes from 4.13.1
+ * Better Gtk3.20 compatibility (fix XfceHeading style, drop deprecated call)
+ * Translation updates
+- Changes from 4.13.0
+ * Add xfce_widget_reparent to replace the deprecated gtk_widget_reparent
+ * Add xfce_titled_dialog_new_with_mixed_buttons to allow for setting
+ icon names, button label text and response id.
+ * Add xfce_gtk_menu_popup_until_mapped as a convenience function to fix
+ widespread problems with popping up menus (e.g. on keyboard shortcuts)
+ * Add dialog UI tests for Gtk2 and Gtk3
+ * Fix Glade Gtk3 support
+ * Fix a memory leak
+- Translation updates
+- Clean up spec file and dropped obsolete macros
+- Added conditional %bcond_with git for easier maintanance when using
+ git master branch
-------------------------------------------------------------------
Mon Dec 18 15:42:55 UTC 2017 - crrodriguez@opensuse.org
diff --git a/libxfce4ui.spec b/libxfce4ui.spec
index 518434f..d477bcf 100644
--- a/libxfce4ui.spec
+++ b/libxfce4ui.spec
@@ -1,7 +1,7 @@
#
# spec file for package libxfce4ui
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,27 +12,33 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+%bcond_with git
%define libname_gtk2 libxfce4ui-1-0
%define libname_gtk3 libxfce4ui-2-0
Name: libxfce4ui
-Version: 4.12.1
+Version: 4.14.1
Release: 0
Summary: Widgets Library for the Xfce Desktop Environment
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: System/Libraries
-Url: http://www.xfce.org/
-Source0: http://archive.xfce.org/src/xfce/libxfce4ui/4.12/%{name}-%{version}.tar.bz2
+URL: https://www.xfce.org/
+%if %{with git}
+Source0: %{name}-%{version}.tar.xz
+%else
+Source0: https://archive.xfce.org/src/xfce/libxfce4ui/4.13/%{name}-%{version}.tar.bz2
+%endif
# needed until all applications have been ported to xfce_dialog_show_help() or
# an alternative mechanism
Source1: xfhelp4.sh
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: update-desktop-files
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(gobject-2.0)
@@ -45,9 +51,9 @@ BuildRequires: pkgconfig(libxfconf-0) >= 4.12
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(x11)
-# avoid circular dependency between libxfce4ui and exo
-#!BuildIgnore: exo-tools
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %{with git}
+BuildRequires: xfce4-dev-tools
+%endif
%description
The libxfce4ui library provides a number of widgets commonly used by Xfce
@@ -56,7 +62,7 @@ applications.
%package -n %{libname_gtk2}
Summary: Widgets Library for the Xfce Desktop Environment
# uses exo-open
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: System/Libraries
Requires: exo-tools
# -branding only contains keyboard shortcuts for some libxfce4ui consumers so
@@ -73,7 +79,7 @@ applications. This package provides the GTK 2 variant of libxfce4ui.
%package -n %{libname_gtk3}
Summary: Widgets Library for the Xfce Desktop Environment
# uses exo-open
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: System/Libraries
Requires: exo-tools
# -branding only contains keyboard shortcuts for some libxfce4ui consumers so
@@ -87,7 +93,7 @@ applications. This package provides the GTK 3 variant of libxfce4ui.
%package tools
Summary: Tools from libxfce4ui
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: System/GUI/XFCE
%description tools
@@ -95,7 +101,7 @@ This package provides tools from libxfce4ui.
%package devel
Summary: Development Files for the libxfce4ui Library
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++
Requires: %{libname_gtk2} = %{version}
Requires: %{libname_gtk3} = %{version}
@@ -107,7 +113,7 @@ the libxfce4ui library.
%package doc
Summary: Documentation for the libxfce4ui Library
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: Documentation/HTML
BuildArch: noarch
@@ -116,7 +122,7 @@ This package provides the documentation for the libxfce4ui library.
%package branding-upstream
Summary: Upstream Branding of libxfce4ui
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: System/GUI/XFCE
Supplements: packageand(%{libname_gtk2}:branding-upstream)
Supplements: packageand(%{libname_gtk3}:branding-upstream)
@@ -132,7 +138,7 @@ This package provides the upstream look and feel for libxfce4ui.
# this should be replaced by %%lang_package once bnc#513786 is resolved
%package lang
Summary: Languages for package %{name}
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: System/Localization
Requires: %{libname_gtk2} = %{version}
Requires: %{libname_gtk3} = %{version}
@@ -145,15 +151,24 @@ BuildArch: noarch
Provides translations to the package %{name}
%prep
-%setup -q
+%autosetup
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
+%if %{with git}
+NOCONFIGURE=1 ./autogen.sh
+%configure \
+ --enable-maintainer-mode \
+ --enable-startup-notification \
+ --with-vendor-info=openSUSE \
+ --disable-static
+%else
%configure \
--enable-startup-notification \
--with-vendor-info=openSUSE \
--disable-static
-make %{?_smp_mflags} V=1
+%endif
+%make_build
%install
%make_install
@@ -179,31 +194,20 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
%postun -n %{libname_gtk3} -p /sbin/ldconfig
-%post tools
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun tools
-%desktop_database_postun
-%icon_theme_cache_postun
-
%files -n %{libname_gtk2}
-%defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README THANKS TODO
+%license COPYING
+%doc AUTHORS NEWS README THANKS TODO
%{_libdir}/libxfce4ui-1.so.*
%{_libdir}/libxfce4kbd-private-2.so.*
%files -n %{libname_gtk3}
-%defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README THANKS TODO
+%license COPYING
+%doc AUTHORS NEWS README THANKS TODO
%{_libdir}/libxfce4ui-2.so.*
%{_libdir}/libxfce4kbd-private-3.so.*
%files lang -f %{name}.lang
-%defattr(-,root,root)
-
%files devel
-%defattr(-, root, root)
%{_libdir}/libxfce4ui-*.so
%{_libdir}/libxfce4kbd-private-*.so
%{_libdir}/pkgconfig/libxfce4ui-*.pc
@@ -214,18 +218,15 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
%{_includedir}/xfce4/libxfce4kbd-private-3/
%files tools
-%defattr(-, root, root)
%{_bindir}/xfhelp4
%{_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/
%files branding-upstream
-%defattr(-, root, root)
%dir %{_sysconfdir}/xdg/xfce4
%dir %{_sysconfdir}/xdg/xfce4/xfconf
%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml