!5 upgrade to 4.16.0 for xfce 4.16

From: @zhang__3125 Reviewed-by: @dwl301 Signed-off-by: @dwl301
2021-06-16 05:21:53 +00:00 · 2021-06-16 05:21:53 +00:00 · 856208f6bd
commit 856208f6bd
parent 50661ec051 ab38e1dec2
4 changed files with 62 additions and 30 deletions
--- a/libxfce4ui-4.14.1.tar.bz2
+++ b/libxfce4ui-4.14.1.tar.bz2
--- a/libxfce4ui-4.16-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 @@
+       <property name="&lt;Alt&gt;F3" type="string" value="xfce4-appfinder">
+         <property name="startup-notify" type="bool" value="true"/>
       </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="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout"/>
+       <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="string" value="xflock4"/>
+       <property name="&lt;Primary&gt;&lt;Alt&gt;t" type="string" value="exo-open --launch TerminalEmulator"/>
+@@ -27,6 +28,15 @@
+       <property name="&lt;Primary&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
+       <property name="&lt;Primary&gt;&lt;Shift&gt;Escape" type="string" value="xfce4-taskmanager"/>
+       <property name="&lt;Super&gt;r" type="string" value="xfce4-appfinder -c">
 +      <property name="XF86Calendar" type="string" value="orage"/>
 +      <property name="XF86Memo" type="string" value="xfce4-notes"/>
 +      <property name="XF86Terminal" type="string" value="xfce4-terminal"/>
@ -23,6 +21,6 @@
 +      <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 name="startup-notify" type="bool" value="true"/>
+       </property>
     </property>
-   </property>
--- a/libxfce4ui-4.16.0.tar.bz2
+++ b/libxfce4ui-4.16.0.tar.bz2
--- 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 <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