[drwright: 2/3] rebase to newer 3.5.0 F-18 release

[Peter Robinson]

commit d923c1536c03087310c086ec78ebc02084c508c7
Merge: 0cd8bae 254f616
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Jul 9 11:00:49 2014 +0100

    rebase to newer 3.5.0 F-18 release

 drwright-gsd-register.patch |   17 +++++++++++++++++
 drwright.spec               |   21 ++++++++++++++-------
 sources                     |    2 +-
 3 files changed, 32 insertions(+), 8 deletions(-)
---
diff --cc drwright.spec
index 1866601,a4bca26..7e0c4a5
--- a/drwright.spec
+++ b/drwright.spec
@@@ -5,9 -5,10 +5,10 @@@ Summary:        Typing monitor to forc
  
  License:        GPLv2+
  URL:            http://www.gnome.org/
- Source0:        http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.xz
- # Backported from upstream
+ Source0:        http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz
+ # Build fix with new gnome-settings-daemon, backported from upstream
+ # commit 6fb8014c
 -Patch0:         drwright-gsd-register.patch
 +Patch0:         drwright-3.2.5-gsd37.patch
  
  BuildRequires:  glib2-devel >= 2.26.0
  BuildRequires:  gtk3-devel >= 3.0.0
@@@ -68,18 -68,10 +68,25 @@@ glib-compile-schemas %{_datadir}/glib-2
  %{_libdir}/gnome-settings-daemon-3.0/typing-break.gnome-settings-plugin
  
  %changelog
 -* Wed Sep 19 2012 Kalev Lember <kalevlember at gmail.com> - 3.5.0-1
++* Wed Jul  9 2014 Peter Robinson <pbrobinson at fedoraproject.org> 
++- Merge newer F-18 into rawhide
++
++* Wed Jul  9 2014 Kalev Lember <kalevlember at gmail.com> - 3.5.0-1
+ - Update to 3.5.0
+ - Fix the build with new gnome-settings-daemon
+ 
 +* Tue Jun 17 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 3.2.5-6
 +- Fix FTBFS with gnome-settings-daemon >= 3.7.3 (#913945, #992154, #1106182)
 +
 +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.5-5
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
 +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.5-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +
 +* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.5-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.5-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
  
@@@ -117,4 -109,4 +124,4 @@@
  - Update to 3.0.0
  
  * Mon Mar  7 2011 Christopher Aillon <caillon at redhat.com> - 2.91.91-1
--- Initial package
++- Initial packagbe