[rpms/ktouch] epel10: Merge branch 'master' into f18

[rpms/ktouch] epel10: Merge branch 'master' into f18

[Rex Dieter]

            A new commit has been pushed.

            Repo   : rpms/ktouch
            Branch : epel10
            Commit : bacbb2c974696f84d26374546a6c729f444e6d8e
            Author : Rex Dieter <rdieter@math.unl.edu>
            Date   : 2013-03-04T10:05:09-06:00
            Stats  : +21/-10 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/ktouch/c/bacbb2c974696f84d26374546a6c729f444e6d8e?branch=epel10

            Log:
            Merge branch 'master' into f18

Conflicts:
	.gitignore
	ktouch.spec
	sources

---
diff --git a/.gitignore b/.gitignore
index 12a8654..8c1612a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-/ktouch-4.8.5.tar.xz
-/ktouch-4.9.1.tar.xz
-/ktouch-4.9.2.tar.xz
-/ktouch-4.9.3.tar.xz
-/ktouch-4.9.4.tar.xz
-/ktouch-4.9.5.tar.xz
+/ktouch-4.10.1.tar.xz

diff --git a/ktouch.spec b/ktouch.spec
index f0a282c..c25a56d 100644
--- a/ktouch.spec
+++ b/ktouch.spec
@@ -1,6 +1,6 @@
 Name:    ktouch
 Summary: Touch Typing Tutor 
-Version: 4.9.5
+Version: 4.10.1
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -64,6 +64,7 @@ fi
 %doc AUTHORS COPYING
 %{_kde4_bindir}/ktouch
 %{_kde4_appsdir}/ktouch/
+%{_kde4_libdir}/kde4/imports/org/kde/ktouch/
 %{_kde4_datadir}/applications/kde4/ktouch.desktop
 %{_kde4_datadir}/config.kcfg/ktouch.kcfg
 %{_kde4_iconsdir}/hicolor/*/*/ktouch.*
@@ -71,8 +72,23 @@ fi
 
 
 %changelog
-* Sat Dec 29 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.5-1
-- 4.9.5
+* Sat Mar 02 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.10.1-1
+- 4.10.1
+
+* Fri Feb 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.10.0-1
+- 4.10.0
+
+* Tue Jan 22 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.9.98-1
+- 4.9.98
+
+* Fri Jan 04 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.9.97-1
+- 4.9.97
+
+* Thu Dec 20 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.95-1
+- 4.9.95
+
+* Tue Dec 04 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.90-1
+- 4.9.90
 
 * Mon Dec 03 2012 Than Ngo <than@redhat.com> - 4.9.4-1
 - 4.9.4

diff --git a/sources b/sources
index f55c989..a12147d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-00e6ce7863a3bec4589f99170856bb03  ktouch-4.9.5.tar.xz
+7de7f576fd1dbca1af2db0502033b2d3  ktouch-4.10.1.tar.xz