[kaffeine/f14: 7/8] Revert "kaffeine 1.1"

[Kevin Kofler]

commit fdc01f47fcbee7db2f30f58a99a247fe47d913ee
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Jun 13 02:12:29 2011 +0200

    Revert "kaffeine 1.1"
    
    This reverts commit a4abec277b823069b978962d37dcfc3aa0d4fa15.
    
    We will merge master wholesale instead.

 .gitignore    |    2 --
 kaffeine.spec |    8 ++------
 sources       |    2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc76108..76e79b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 kaffeine-1.0.tar.gz
 kaffeine.png
-/kaffeine.png
-/kaffeine-1.1.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index 504e002..42e1e90 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
 Name:    kaffeine
-Version: 1.1
-Release: 1%{?dist}
+Version: 1.0
+Release: 5%{?dist}
 
 License: GPLv2+
 Summary: KDE media player
@@ -90,10 +90,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 
 
 %changelog
-* Mon Sep 06 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.1-1
-- kaffeine 1.1
-- fixes #618738
-
 * Sun Jul 04 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-5
 - changed Requires to kdebase-runtime
 - added kaffeine.png to fix #611273
diff --git a/sources b/sources
index 852e1cf..13aa78c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+81bac76f931245a75f20ed26a37c55e3  kaffeine-1.0.tar.gz
 d3c40c38c24d30e73b90ac6aa81f0059  kaffeine.png
-72284197b1c90adf75149311e4422efe  kaffeine-1.1.tar.gz