[libxfce4ui] Update to latest stable release 4.12.0
nonamedotc
nonamedotc at fedoraproject.org
Sat Feb 28 19:22:17 UTC 2015
commit 10bf467ce19c57e2b0f54b50fb01b0c879785c98
Author: nonamedotc <nonamedotc at fedoraproject.org>
Date: Sat Feb 28 13:22:15 2015 -0600
Update to latest stable release 4.12.0
- Remove upstreamed patches
- Built with GTK3 enabled
- change Terminal to xfce4-terminal in shortcuts patch
.gitignore | 1 +
libxfce4ui-4.12.0-keyboard-shortcuts.patch | 31 ++++++++++++++++++++++++++++
libxfce4ui.spec | 33 +++++++++++++++---------------
sources | 2 +-
4 files changed, 50 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6927c9a..dfb0f7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ libxfce4ui-4.7.2.tar.bz2
/libxfce4ui-4.9.1.tar.bz2
/libxfce4ui-4.9.2.tar.bz2
/libxfce4ui-4.10.0.tar.bz2
+/libxfce4ui-4.12.0.tar.bz2
diff --git a/libxfce4ui-4.12.0-keyboard-shortcuts.patch b/libxfce4ui-4.12.0-keyboard-shortcuts.patch
new file mode 100644
index 0000000..69b02f3
--- /dev/null
+++ b/libxfce4ui-4.12.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="xfce4-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 a77d644..e599a89 100644
--- a/libxfce4ui.spec
+++ b/libxfce4ui.spec
@@ -1,10 +1,10 @@
# Review at https://bugzilla.redhat.com/show_bug.cgi?id=554599
-%global xfceversion 4.10
+%global xfceversion 4.12
Name: libxfce4ui
-Version: 4.10.0
-Release: 14%{?dist}
+Version: 4.12.0
+Release: 1%{?dist}
Summary: Commonly used Xfce widgets
Group: System Environment/Libraries
@@ -16,15 +16,8 @@ Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-
Patch1: libxfce4ui-4.10.0-avoid-double-fork.patch
## Downstream patches
# add more keyboard shortcuts to make multimedia keyboards work out of the box
-Patch10: libxfce4ui-4.10.0-keyboard-shortcuts.patch
-
-# upstream patches to fix 1095362
-# source of patches - https://bugzilla.xfce.org/show_bug.cgi?id=8744
-Patch11: enable-shift-modifier-in-shortcut-dialog.patch
-Patch12: enable-shift-modifier-in-shortcut-grabber.patch
-Patch13: enable-shortcut.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Terminal changed to xfce4-terminal in the patch
+Patch10: libxfce4ui-4.12.0-keyboard-shortcuts.patch
BuildRequires: pkgconfig(gobject-2.0) >= 2.24.0
BuildRequires: pkgconfig(gtk+-2.0) >= 2.20.0
@@ -34,6 +27,7 @@ BuildRequires: pkgconfig(libxfconf-0) >= %{xfceversion}
BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.4
BuildRequires: gtk-doc
BuildRequires: desktop-file-utils
+BuildRequires: gtk3-devel
%if 0%{?fedora} > 20
BuildRequires: glade3-libgladeui-devel >= 3.5.0
%endif
@@ -80,12 +74,9 @@ developing applications that use %{name}.
%setup -q
%patch1 -p1
%patch10 -p1 -b .shortcuts
-%patch11 -p1
-%patch12 -p1
-%patch13
%build
-%configure --enable-gtk-doc \
+%configure --enable-gtk-doc --enable-gtk3\
%if 0%{?fedora} < 21
--disable-gladeui \
%endif
@@ -105,6 +96,10 @@ make %{?_smp_mflags} V=1
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# fix permissions for installed libraries
+chmod 755 $RPM_BUILD_ROOT/%{_libdir}/*.so
+
find %{buildroot} -name '*.la' -exec rm -f {} ';'
%find_lang %{name}
@@ -151,6 +146,12 @@ rm -rf %{buildroot}
%endif
%changelog
+* Sat Feb 28 2015 Mukundan Ragavan <noamedotc at fedoraproject.org> - 4.12.0-1
+- Update to latest stable release 4.12.0
+- Remove upstreamed patches
+- Built with GTK3 enabled
+- change Terminal to xfce4-terminal in shortcuts patch
+
* Sat Feb 21 2015 Till Maas <opensource at till.name> - 4.10.0-14
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
diff --git a/sources b/sources
index 22ceaf3..2982fad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6df1ce474a3d4885aee31cda9dbc9192 libxfce4ui-4.10.0.tar.bz2
+0215b94338a2592e7284aaa23c5c5661 libxfce4ui-4.12.0.tar.bz2
More information about the scm-commits
mailing list