7 changed files with 108 additions and 45 deletions
--- a/02_pager-size-for-viewport.patch
+++ b/02_pager-size-for-viewport.patch
@ -1,7 +1,10 @@
-diff -uNr xfce4-panel-4.18.0.orig/plugins/pager/pager.c xfce4-panel-4.18.0/plugins/pager/pager.c
--- xfce4-panel-4.18.0.orig/plugins/pager/pager.c	2020-12-11 07:14:07.000000000 +0800
-+++ xfce4-panel-4.18.0/plugins/pager/pager.c	2021-06-16 10:48:07.941357680 +0800
-@@ -776,6 +776,19 @@
+Description: Fix workspace miniature size calculation wrong for viewport mode
+Author: Bin Guo <gb2312@rcn.com>
+Debian-Bug: https://bugs.debian.org/785582
+
+--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
+@@ -662,6 +662,18 @@ pager_plugin_get_preferred_width (GtkWid
   else if (plugin->miniature_view)
     {
       n_workspaces = wnck_screen_get_workspace_count (plugin->wnck_screen);
@ -17,7 +20,6 @@ diff -uNr xfce4-panel-4.18.0.orig/plugins/pager/pager.c xfce4-panel-4.18.0/plugi
 +                               * (wnck_workspace_get_height (active_ws) / wnck_screen_get_height (plugin->wnck_screen));
 +             }
 +        }
-+
       n_cols = MAX (1, (n_workspaces + plugin->rows - 1) / plugin->rows);
       min_width = nat_width = (gint) (xfce_panel_plugin_get_size (XFCE_PANEL_PLUGIN (plugin)) / plugin->rows * plugin->ratio * n_cols);
     }
--- a/README.en.md
+++ b/README.en.md
@ -0,0 +1,36 @@
+# xfce4-panel
+
+#### Description
+Next generation panel for Xfce
+
+#### 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/)
--- a/README.md
+++ b/README.md
@ -0,0 +1,37 @@
+# xfce4-panel
+
+#### 介绍
+Next generation panel for Xfce
+
+#### 软件架构
+软件架构说明
+
+
+#### 安装教程
+
+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/)
--- a/xfce4-panel-4.14.4.tar.bz2
+++ b/xfce4-panel-4.14.4.tar.bz2
--- a/xfce4-panel-4.18.0.tar.bz2
+++ b/xfce4-panel-4.18.0.tar.bz2
--- a/xfce4-panel.spec
+++ b/xfce4-panel.spec
@ -1,18 +1,15 @@
-%global xfceversion 4.18
-
-%global namespc Libxfce4panel
-
+%global xfceversion 4.14
+# Don't check .so files in /lib64/xfce4/panel/plugins
 %global __provides_exclude_from ^%{_libdir}/xfce4/panel/plugins/.*\\.so$
-%global _with_vala 1
+%global _with_vala 0

 Name:           xfce4-panel
-Version:        4.18.0
-Release:        2
-Summary:        Next generation panel for Xfce
-
+Version:        4.14.4
+Release:        1%{?dist}
+Summary:        panel for Xfce4 desktop environment
 License:        GPLv2+ and LGPLv2+
+#Group:          Development/Libraries
 URL:            http://www.xfce.org/
-#VCS git:git://git.xfce.org/xfce/xfce4-panel
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2

 # clock icon taken from system-config-date, license is GPLv2+
@ -21,7 +18,8 @@ Source2:        xfce4-clock.svg
 # patch from Debian
 Patch1:         02_pager-size-for-viewport.patch

-BuildRequires: make
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#BuildArch:      noarch
 BuildRequires:  gcc-c++
 BuildRequires:  gtk3-devel
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
@ -36,25 +34,15 @@ BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
 BuildRequires:  gtk-doc
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  libdbusmenu-gtk3-devel
-
 %if %{_with_vala}
 BuildRequires:  vala
 %endif

-
-# obsolete old plugins
-Obsoletes:      orage < 4.12.1-17
-Obsoletes:      xfce4-embed-plugin < 1.6.0-13
-Obsoletes:      xfce4-cellmodem-plugin < 0.0.5-29
-Obsoletes:      xfce4-kbdleds-plugins < 0.0.6-20
-Obsoletes:      xfce4-hardware-monitor-plugin < 1.6.0-11
-
 %description
 This package includes the panel for the Xfce desktop environment.

 %package devel
-Summary:        Development headers for xfce4-panel
+Summary:        Xfce4 panel development files
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       libxfce4util-devel >= %{xfceversion}
@ -64,7 +52,6 @@ Requires:       libxfce4ui-devel >= %{xfceversion}
 This package includes the header files you will need to build
 plugins for xfce4-panel.

-
 %prep
 %setup -q
 %patch1 -p1 -b .default
@ -72,7 +59,6 @@ plugins for xfce4-panel.
 # Fix icon in 'Add new panel item' dialog
 sed -i 's|Icon=office-calendar|Icon=xfce4-clock|g' plugins/clock/clock.desktop.in.in

-
 %build
 %configure --enable-gtk-doc --disable-static 

@ -89,8 +75,19 @@ export LD_LIBRARY_PATH="`pwd`/libxfce4panel/.libs"
 %install
 %make_install

+# fix permissions for installed libs
+chmod 755 %{buildroot}%{_libdir}/*.so
+
 find %{buildroot} -name '*.la' -exec rm -f {} ';'

+# remove duplicate docs
+rm -f %{buildroot}%{_docdir}/xfce4-panel/README.gtkrc-2.0
+
+# FIXME: We need to own these dirs until all plugins are ported to Xfce 4.8
+mkdir -p %{buildroot}%{_libexecdir}/xfce4/panel-plugins
+mkdir -p %{buildroot}%{_libdir}/xfce4/panel-plugins
+mkdir -p %{buildroot}%{_datadir}/xfce4/panel-plugins
+
 %find_lang %{name}

 desktop-file-validate %{buildroot}/%{_datadir}/applications/panel-desktop-handler.desktop
@ -102,13 +99,13 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/

 %files -f %{name}.lang
 %license COPYING
-%doc AUTHORS ChangeLog NEWS
+%doc AUTHORS ChangeLog NEWS README docs/README.gtkrc-2.0
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/default.xml
 %{_bindir}/*
 %{_libdir}/libxfce4panel-*.so.*
 %{_libdir}/xfce4/panel/
-%{_libdir}/girepository-1.0/%{namespc}-2.0.typelib
-%{_datadir}/gir-1.0/%{namespc}-2.0.gir
+%{_libdir}/girepository-1.0/libxfce4panel-2.0.typelib
+%{_datadir}/gir-1.0/libxfce4panel-2.0.gir
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/xfce4/panel/
 %{_datadir}/applications/*.desktop
@ -116,6 +113,10 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
 %{_datadir}/vala/vapi/libxfce4panel-2.0.deps
 %{_datadir}/vala/vapi/libxfce4panel-2.0.vapi
 %endif
+# FIXME: Remove these when no longer needed
+%dir %{_libexecdir}/xfce4/panel-plugins/
+%dir %{_libdir}/xfce4/panel-plugins
+%dir %{_datadir}/xfce4/panel-plugins

 %files devel
 %{_libdir}/pkgconfig/*
@ -124,14 +125,5 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
 %{_includedir}/xfce4/libxfce4panel-*/

 %changelog
-* Mon Feb 27 2023 wenlong ding <wenlong.ding@turbolinux.com.cn> - 4.18.0-2
- Enable vala compile support.
-
-* 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
-
 * Thu Jul 9 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 4.14.4-1
 - Init package
--- a/xfce4-panel.yaml
+++ b/xfce4-panel.yaml
@ -1,4 +0,0 @@
-version_control: git
-src_repo: https://gitlab.xfce.org/xfce/xfce4-panel.git
-tag_prefix: "xfce4-panel-"
-seperator: "."