From eeb746fc9ce41c446ef5a5baaff9e2733983ce01 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Wed, 5 Jan 2011 15:19:06 -0600
Subject: [PATCH] - 4.5.5

---
 .gitignore                       |  4 +---
 kdelibs-4.5.4-kdoctools_el.patch | 37 --------------------------------
 kdelibs.spec                     |  9 ++++----
 sources                          |  2 +-
 4 files changed, 7 insertions(+), 45 deletions(-)
 delete mode 100644 kdelibs-4.5.4-kdoctools_el.patch

diff --git a/.gitignore b/.gitignore
index 050814f..e882019 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/kdelibs-4.5.2.tar.bz2
-/kdelibs-4.5.3.tar.bz2
-/kdelibs-4.5.4.tar.bz2
+/kdelibs-4.5.5.tar.bz2
diff --git a/kdelibs-4.5.4-kdoctools_el.patch b/kdelibs-4.5.4-kdoctools_el.patch
deleted file mode 100644
index bae2bf6..0000000
--- a/kdelibs-4.5.4-kdoctools_el.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- branches/KDE/4.5/kdelibs/kdoctools/customization/el/user.entities	2010/06/27 18:59:06	1143427
-+++ branches/KDE/4.5/kdelibs/kdoctools/customization/el/user.entities	2010/12/01 19:19:41	1202659
-@@ -6,3 +6,34 @@
-      names (which if they occur will cost you a _lot_ of time)
-  -->
- 
-+<!ENTITY Alt	"<keycap>Alt</keycap>">
-+<!ENTITY Backspace	"<keycap>Backspace</keycap>">
-+<!ENTITY cdrom	'<hardware>συσκευή CD-ROM</hardware>'>
-+<!ENTITY Ctrl	"<keycap>Ctrl</keycap>">
-+<!ENTITY dpi	'<acronym>dpi</acronym>'>
-+<!ENTITY eg     "<abbrev>π.χ.</abbrev>">
-+<!ENTITY Enter	"<keycap>Enter</keycap>">
-+<!ENTITY Esc	"<keycap>Esc</keycap>">
-+<!ENTITY etc    "<abbrev>κλπ.</abbrev>">
-+<!ENTITY FAQ	'<acronym>FAQ</acronym>'>
-+<!ENTITY ie     "<abbrev>δηλ.</abbrev>">
-+<!ENTITY infocenter	"<application>Κέντρο πληροφοριών</application>">
-+<!ENTITY kcontrolcenter	"<application>Κέντρο ελέγχου του &kde;</application>">
-+<!ENTITY kicon	"<guiicon>
-+<inlinemediaobject>
-+ <objectinfo><title>&kde;'s K-icon</title></objectinfo>
-+ <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject>
-+ <textobject><phrase>K</phrase></textobject>
-+</inlinemediaobject>
-+</guiicon> icon"><!-- if image is localised, then entityref should be used 
-+                      instead of fileref -->
-+<!ENTITY kmenu  "<guimenu>K</guimenu> menu">
-+<!ENTITY LMB    "<mousebutton>αριστερό</mousebutton> κλικ ποντικιού">
-+<!ENTITY MMB    "<mousebutton>μεσαίο</mousebutton> κλικ ποντικιού">
-+<!ENTITY OS	"λειτουργικό σύστημα"><!-- <acronym>OS</acronym>-->
-+<!ENTITY partman "<application>Διαχειριστής κατατμήσεων του KDE</application>">
-+<!ENTITY RMB    "<mousebutton>δεξί</mousebutton> κλικ ποντικιού">
-+<!ENTITY Shift	"<keycap>Shift</keycap>">
-+<!ENTITY systemsettings	"<application>Ρυθμίσεις συστήματος</application>">
-+<!ENTITY systemtray "<application>πλαίσιο συστήματος</application>">
-+<!ENTITY Tab	"<keycap>Tab</keycap>">
diff --git a/kdelibs.spec b/kdelibs.spec
index db2c8f0..15a1f38 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -15,8 +15,8 @@
 %global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
 
 Summary: KDE Libraries
-Version: 4.5.4
-Release: 2%{?dist}
+Version: 4.5.5
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -102,7 +102,6 @@ Patch27: kdelibs-4.4.80-no_rpath.patch
 Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
 
 ## 4.5 upstream, stable branch
-Patch100: kdelibs-4.5.4-kdoctools_el.patch
 
 ## trunk upstream
 # http://websvn.kde.org/?view=revision&revision=1185912
@@ -271,7 +270,6 @@ format for use with the Qt 4 Assistant or KDevelop 4.
 %patch50 -p1 -b .knewstuff_gpg2
 
 # upstream patches, stable branch
-%patch100 -p4 -b .kdoctools_el
 
 # upstream patches, trunk
 %patch151 -p3 -b .plasma_wallpaper_configchanged
@@ -520,6 +518,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jan 05 2011 Rex Dieter <rdieter@fedoraproject.org> 4.5.5-1
+- 4.5.5
+
 * Sat Dec 04 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.4-2
 - update kdoctools/el from branch (kde-l10n entities)
 
diff --git a/sources b/sources
index f93d106..1805394 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e24a1e02f5626f1dc969168541b2741  kdelibs-4.5.4.tar.bz2
+a6037c53d34fe28f8a135181fe7c923b  kdelibs-4.5.5.tar.bz2