!7 Update to 4.18.0

From: @misaka00251 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125

README.en.md

@@ -1,36 +0,0 @@
-# libxfce4ui
-
-#### Description
-Commonly used Xfce widgets
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -1,37 +0,0 @@
-# libxfce4ui
-
-#### 介绍
-Commonly used Xfce widgets
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

libxfce4ui-4.14-keyboard-shortcuts.patch

@@ -1,28 +0,0 @@
---- 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 @@
-       </property>
-       <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xflock4"/>
-       <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="string" value="xflock4"/>
-+      <property name="&lt;Control&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
-       <property name="&lt;Primary&gt;&lt;Alt&gt;t" type="string" value="exo-open --launch TerminalEmulator"/>
-       <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
-       <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
-       <property name="&lt;Primary&gt;Escape" type="string" value="xfdesktop --menu"/>
-+      <property name="XF86LogOff" type="string" value="xfce4-session-logout"/>
-+      <property name="Print" type="string" value="xfce4-screenshooter -f"/>
-+      <property name="&lt;Alt&gt;Print" type="string" value="xfce4-screenshooter -w"/>
-       <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
-       <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
-+      <property name="XF86Calendar" type="string" value="orage"/>
-+      <property name="XF86Memo" type="string" value="xfce4-notes"/>
-+      <property name="XF86Terminal" type="string" value="xfce4-terminal"/>
-+      <property name="XF86Explorer" type="string" value="Thunar"/>
-+      <property name="XF86AudioMedia" type="string" value="pragha"/>
-+      <property name="XF86AudioPlay" type="string" value="pragha --pause"/>
-+      <property name="XF86AudioPrev" type="string" value="pragha --prev"/>
-+      <property name="XF86AudioNext" type="string" value="pragha --next"/>
-+      <property name="XF86Calculator" type="string" value="galculator"/>
-       <property name="Print" type="string" value="xfce4-screenshooter"/>
-     </property>
-   </property>

libxfce4ui.spec

@@ -1,21 +1,19 @@
-%global xfceversion 4.14
+%global xfceversion 4.18
+%global namespc Libxfce4ui
+
 Name:           libxfce4ui
-Version:        4.14.1
+Version:        4.18.0
-Release:        1%{?dist}
+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
-# 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 +22,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,13 +49,15 @@ 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
-%patch10
 
 %build
 %configure --disable-static
@@ -61,25 +73,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
+%{_libdir}/girepository-1.0/%{namespc}-2.0.typelib
-%{_bindir}/xfce4-about
+%{_datadir}/gir-1.0/%{namespc}-2.0.gir
-%{_datadir}/gir-1.0/%{name}-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 +117,11 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_datadir}/glade/pixmaps/hicolor/*/actions/*
 
 %changelog
+* Wed Jan 04 2023 misaka00251 <liuxin@iscas.ac.cn> - 4.18.0-1
+- Update to 4.18.0
+
+* Fri Jun 18 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 4.16.0-1
+- Update to 4.16.0
+
 * Wed Jul 8 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 4.14.1-1
 - Init package

libxfce4ui.yaml

@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://gitlab.xfce.org/xfce/libxfce4ui.git
+tag_prefix: "libxfce4ui-"
+seperator: "."