diff --git a/libxfce4ui-4.14.1.tar.bz2 b/libxfce4ui-4.14.1.tar.bz2
deleted file mode 100644
index 77d8a14..0000000
Binary files a/libxfce4ui-4.14.1.tar.bz2 and /dev/null differ
diff --git a/libxfce4ui-4.14-keyboard-shortcuts.patch b/libxfce4ui-4.16-keyboard-shortcuts.patch
similarity index 51%
rename from libxfce4ui-4.14-keyboard-shortcuts.patch
rename to libxfce4ui-4.16-keyboard-shortcuts.patch
index 9d73c5a..4a9a66f 100644
--- a/libxfce4ui-4.14-keyboard-shortcuts.patch
+++ b/libxfce4ui-4.16-keyboard-shortcuts.patch
@@ -1,19 +1,17 @@
---- libxfce4kbd-private/xfce4-keyboard-shortcuts.xml.orig 2019-05-17 20:47:46.177418982 -0400
-+++ libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2019-05-17 21:02:11.273407207 -0400
-@@ -12,12 +12,25 @@
+--- libxfce4kbd-private/xfce4-keyboard-shortcuts.xml.orig 2020-07-02 19:03:34.031859077 -0400
++++ libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2020-07-02 19:10:04.371529145 -0400
+@@ -10,6 +10,7 @@
+
+
-
-
-+
-
-
-
-
+
-+
-+
-
-
+
+
+
+@@ -27,6 +28,15 @@
+
+
+
+
+
+
@@ -23,6 +21,6 @@
+
+
+
-
+
+
-
diff --git a/libxfce4ui-4.16.0.tar.bz2 b/libxfce4ui-4.16.0.tar.bz2
new file mode 100644
index 0000000..3a20b6f
Binary files /dev/null and b/libxfce4ui-4.16.0.tar.bz2 differ
diff --git a/libxfce4ui.spec b/libxfce4ui.spec
index 566151f..934dad5 100644
--- a/libxfce4ui.spec
+++ b/libxfce4ui.spec
@@ -1,21 +1,24 @@
-%global xfceversion 4.14
+%global xfceversion 4.16
+%global namespc Libxfce4ui
+
Name: libxfce4ui
-Version: 4.14.1
+Version: 4.16.0
Release: 1
Summary: Commonly used Xfce widgets
+
License: LGPLv2+
-#Group: Development/Libraries
URL: http://xfce.org/
Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+
+## Downstream patches
# add more keyboard shortcuts to make multimedia keyboards work out of the box
# Terminal changed to xfce4-terminal in the patch
Patch10: libxfce4ui-%{xfceversion}-keyboard-shortcuts.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildArch: noarch
BuildRequires: gcc-c++
BuildRequires: pkgconfig(gobject-2.0) >= 2.24.0
BuildRequires: pkgconfig(gtk+-2.0) >= 2.20.0
+BuildRequires: libSM-devel
BuildRequires: pkgconfig(libxfce4util-1.0) >= %{xfceversion}
BuildRequires: pkgconfig(libxfconf-0) >= %{xfceversion}
BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.4
@@ -24,14 +27,26 @@ BuildRequires: desktop-file-utils
BuildRequires: gtk3-devel
BuildRequires: glade-devel
BuildRequires: gettext
-BuildRequires: gobject-introspection-devel
BuildRequires: intltool
-BuildRequires: libSM-devel
+BuildRequires: gobject-introspection-devel
BuildRequires: vala
+BuildRequires: make
+BuildRequires: libgtop2-devel
+
+Obsoletes: libxfcegui4 < 4.10.0-9
%description
Libxfce4ui is used to share commonly used Xfce widgets among the Xfce applications.
+
+%package -n xfce4-about
+Summary: Xfce 4 'About' dialog
+
+%description -n xfce4-about
+This package contains the 'About Xfce' dialog with info on the desktop
+environment, it's contributors, and it's licensing.
+
+
%package devel
Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release}
@@ -39,9 +54,12 @@ Requires: gtk2-devel
Requires: libxfce4util-devel
Requires: glade-devel
Requires: pkgconfig
+Obsoletes: libxfcegui4-devel < 4.10.0-9
%description devel
-This package contains libraries and header files for developing applications that use %{name}.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
%prep
%setup -q
@@ -61,25 +79,38 @@ export LD_LIBRARY_PATH="`pwd`/libxfce4ui/.libs"
%make_install
# fix permissions for installed libraries
-chmod 755 $RPM_BUILD_ROOT/%{_libdir}/*.so
+chmod 755 %{buildroot}%{_libdir}/*.so
find %{buildroot} -name '*.la' -exec rm -f {} ';'
%find_lang %{name}
+# Move xfce4-about to the 'Documentation' category
+desktop-file-install \
+ --delete-original \
+ --remove-category=X-Xfce-Toplevel \
+ --add-category=Documentation \
+ --add-category=System \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/xfce4-about.desktop
+
+
%ldconfig_scriptlets
+
%files -f %{name}.lang
%license COPYING
-%doc AUTHORS NEWS README THANKS
+%doc AUTHORS NEWS THANKS
%config(noreplace) %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
%{_libdir}/*.so.*
-%{_libdir}/girepository-1.0/%{name}-2.0.typelib
-%{_bindir}/xfce4-about
-%{_datadir}/gir-1.0/%{name}-2.0.gir
+%{_libdir}/girepository-1.0/%{namespc}-2.0.typelib
+%{_datadir}/gir-1.0/%{namespc}-2.0.gir
%{_datadir}/vala/vapi/%{name}-2.deps
%{_datadir}/vala/vapi/%{name}-2.vapi
+
+%files -n xfce4-about
+%{_bindir}/xfce4-about
%{_datadir}/applications/xfce4-about.desktop
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-logo.png
+%{_datadir}/icons/hicolor/*/apps/*xfce*
%files devel
%doc TODO
@@ -92,5 +123,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_datadir}/glade/pixmaps/hicolor/*/actions/*
%changelog
+* Fri Jun 18 2021 zhanglin - 4.16.0-1
+- Update to 4.16.0
+
* Wed Jul 8 2020 Dillon Chen - 4.14.1-1
- Init package