From 7363ee91e84a484e2714cb6b443e74238250bcbd Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: Oct 07 2010 21:08:26 +0000
Subject: - Update to 4.7.3

- Drop dependency on gtk-doc (#604399)

---

diff --git a/.gitignore b/.gitignore
index 2f8358f..ae55b28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libxfce4ui-4.7.2.tar.bz2
+/libxfce4ui-4.7.3.tar.bz2
diff --git a/libxfce4ui-4.7.2-keyboard-shortcuts.patch b/libxfce4ui-4.7.2-keyboard-shortcuts.patch
deleted file mode 100644
index add12d8..0000000
--- a/libxfce4ui-4.7.2-keyboard-shortcuts.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- libxfce4ui-4.7.2.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml	2010-05-25 12:29:44.000000000 +0200
-+++ libxfce4ui-4.7.2/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml	2010-05-25 12:32:39.000000000 +0200
-@@ -3,9 +3,20 @@
- <channel name="xfce4-keyboard-shortcuts" version="1.0">
-   <property name="commands" type="empty">
-     <property name="default" type="empty">
-+      <property name="&lt;Alt&gt;F1" type="string" value="xfhelp4"/>
-       <property name="&lt;Alt&gt;F2" type="string" value="xfrun4"/>
-       <property name="&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xflock4"/>
-+      <property name="&lt;Control&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
-+      <property name="&lt;Control&gt;Escape" type="string" value="xfce4-popup-menu"/>
-+      <property name="&lt;Control&gt;&lt;Alt&gt;L" type="string" value="xfce4-session-logout"/>
-+      <property name="XF86WWW" type="string" value="xfbrowser4"/>
-+      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
-       <property name="XF86Display" type="string" value="xrandr --auto"/>
-+      <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="Print" type="string" value="xfce4-screenshooter -f"/>
-+      <property name="&lt;Alt&gt;Print" type="string" value="xfce4-screenshooter -w"/>
-       <property name="&lt;Control&gt;Escape" type="string" values="xfdesktop --menu"/>
-     </property>
-   </property>
diff --git a/libxfce4ui-4.7.3-keyboard-shortcuts.patch b/libxfce4ui-4.7.3-keyboard-shortcuts.patch
new file mode 100644
index 0000000..e12e6a4
--- /dev/null
+++ b/libxfce4ui-4.7.3-keyboard-shortcuts.patch
@@ -0,0 +1,24 @@
+--- libxfce4ui-4.7.3.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml	2010-09-05 12:34:39.000000000 +0200
++++ libxfce4ui-4.7.3/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml	2010-09-05 23:42:24.000000000 +0200
+@@ -3,10 +3,21 @@
+ <channel name="xfce4-keyboard-shortcuts" version="1.0">
+   <property name="commands" type="empty">
+     <property name="default" type="empty">
++      <property name="&lt;Alt&gt;F1" type="string" value="xfhelp4"/>
+       <property name="&lt;Alt&gt;F2" type="string" value="xfrun4"/>
+       <property name="&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xflock4"/>
++      <property name="&lt;Control&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
++      <property name="&lt;Control&gt;Escape" type="string" value="xfce4-popup-menu"/>
++      <property name="&lt;Control&gt;&lt;Alt&gt;L" type="string" value="xfce4-session-logout"/>
++      <property name="XF86WWW" type="string" value="xfbrowser4"/>
++      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
+       <property name="XF86Display" type="string" value="xrandr --auto"/>
+       <property name="&lt;Control&gt;Escape" type="string" value="xfdesktop --menu"/>
++      <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="Print" type="string" value="xfce4-screenshooter -f"/>
++      <property name="&lt;Alt&gt;Print" type="string" value="xfce4-screenshooter -w"/>
+     </property>
+   </property>
+   <property name="xfwm4" type="empty">
diff --git a/libxfce4ui.spec b/libxfce4ui.spec
index 5788bbe..39fd813 100644
--- a/libxfce4ui.spec
+++ b/libxfce4ui.spec
@@ -1,15 +1,15 @@
 %global xfceversion 4.7
 
 Name:           libxfce4ui
-Version:        4.7.2
-Release:        2%{?dist}
+Version:        4.7.3
+Release:        1%{?dist}
 Summary:        Commonly used Xfce widgets
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://xfce.org/
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-Patch0:         libxfce4ui-4.7.2-keyboard-shortcuts.patch
+Patch0:         libxfce4ui-4.7.3-keyboard-shortcuts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.12.0
@@ -40,7 +40,6 @@ Requires:       %{name} = %{version}-%{release}
 Requires:       gtk2-devel
 Requires:       libxfce4util-devel
 Requires:       glade3-libgladeui-devel
-Requires:       gtk-doc
 Requires:       pkgconfig
 # do this later
 #Provides:       libxfcegui4-devel = %{version}
@@ -71,7 +70,7 @@ make %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %find_lang %{name}
 
@@ -101,12 +100,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/glade3/modules/lib*.so
 %{_libdir}/pkgconfig/*.pc
-%doc %{_datadir}/gtk-doc/html/%{name}/
+%doc %{_datadir}/gtk-doc/
 %{_datadir}/glade3/catalogs/%{name}.xml*
 %{_datadir}/glade3/pixmaps/hicolor/*/actions/*
 
 
 %changelog
+* Sun Sep 05 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.3-1
+- Update to 4.7.3
+- Drop dependency on gtk-doc (#604399)
+
 * Tue Jul 27 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.2-2
 - Fix file conflict with libxfce4gui (#618719)
 
diff --git a/sources b/sources
index 4f8d0a8..289d1f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10438d8a042ebd024f4c360c96196704  libxfce4ui-4.7.2.tar.bz2
+919ebc5891a4403fa352f65e42ee401f  libxfce4ui-4.7.3.tar.bz2