[libxfce4ui] Make a separate package for xfce4-about
Christoph Wickert
cwickert at fedoraproject.org
Sat Oct 27 20:48:49 UTC 2012
commit 749c607c058300276432b836a7bcec0da848efaa
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sat Oct 27 22:48:42 2012 +0200
Make a separate package for xfce4-about
- Add more keyboard shortcuts
- Move xfce4-about menu entry to 'Documentation' category
libxfce4ui-4.10.0-keyboard-shortcuts.patch | 31 ++++++++++++++++++
libxfce4ui.spec | 48 +++++++++++++++++++++------
2 files changed, 68 insertions(+), 11 deletions(-)
---
diff --git a/libxfce4ui-4.10.0-keyboard-shortcuts.patch b/libxfce4ui-4.10.0-keyboard-shortcuts.patch
new file mode 100644
index 0000000..7acfbb6
--- /dev/null
+++ b/libxfce4ui-4.10.0-keyboard-shortcuts.patch
@@ -0,0 +1,31 @@
+--- libxfce4ui-4.10.0.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2012-04-28 21:46:52.000000000 +0200
++++ libxfce4ui-4.10.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2012-10-13 15:53:57.749846107 +0200
+@@ -11,11 +11,28 @@
+ <property name="startup-notify" type="bool" value="true"/>
+ </property>
+ <property name="<Control><Alt>Delete" type="string" value="xflock4"/>
++ <property name="<Control><Alt>Escape" type="string" value="xkill"/>
+ <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
+ <property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/>
+ <property name="<Control>Escape" type="string" value="xfdesktop --menu"/>
++ <property name="XF86LogOff" type="string" value="xfce4-session-logout"/>
++ <property name="<Control><Alt>L" type="string" value="xfce4-session-logout"/>
++ <property name="Print" type="string" value="xfce4-screenshooter -f"/>
++ <property name="<Alt>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="Terminal"/>
++ <property name="XF86Explorer" type="string" value="Thunar"/>
++ <property name="XF86AudioRaiseVolume" type="string" value="amixer set Master 10%+ -q"/>
++ <property name="XF86AudioLowerVolume" type="string" value="amixer set Master 10%- -q"/>
++ <property name="XF86AudioMute" type="string" value="amixer set Master toggle -q"/>
++ <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>
+ </property>
+ <property name="xfwm4" type="empty">
diff --git a/libxfce4ui.spec b/libxfce4ui.spec
index 2655a2e..57246d1 100644
--- a/libxfce4ui.spec
+++ b/libxfce4ui.spec
@@ -4,7 +4,7 @@
Name: libxfce4ui
Version: 4.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Commonly used Xfce widgets
Group: System Environment/Libraries
@@ -12,6 +12,9 @@ License: LGPLv2+
URL: http://xfce.org/
#VCS git:git://git.xfce.org/xfce/libxfce4ui
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
+Patch10: libxfce4ui-4.10.0-keyboard-shortcuts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig(gobject-2.0) >= 2.24.0
@@ -34,6 +37,16 @@ BuildRequires: intltool
Libxfce4ui is used to share commonly used Xfce widgets among the Xfce
applications.
+
+%package -n xfce4-about
+Summary: Xfce 4 'About' dialog
+Group: User Interface/Desktops
+
+%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}
Group: Development/Libraries
@@ -54,6 +67,7 @@ developing applications that use %{name}.
%prep
%setup -q
+%patch10 -p1 -b .shortcuts
%build
@@ -71,17 +85,22 @@ make %{?_smp_mflags} V=1
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
%find_lang %{name}
-desktop-file-install \
- --delete-original \
- --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-about.desktop
+
+# Move xfce4-about to the 'Documentation' category
+desktop-file-install \
+ --delete-original \
+ --remove-category=X-Xfce-Toplevel \
+ --add-category=Documentation \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/xfce4-about.desktop
+
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
@@ -95,6 +114,10 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
%{_libdir}/*.so.*
+%files -n xfce4-about
+%{_bindir}/xfce4-about
+%{_datadir}/applications/xfce4-about.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xfce4-logo.png
%files devel
%defattr(-,root,root,-)
@@ -104,10 +127,13 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%doc %{_datadir}/gtk-doc/
-%{_datadir}/applications/xfce4-about.desktop
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-logo.png
%changelog
+* Sat Oct 13 2012 Christoph Wickert <cwickert at fedoraproject.org> - 4.10.0-3
+- Make a separate package for xfce4-about
+- Add more keyboard shortcuts
+- Move xfce4-about menu entry to 'Documentation' category
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list