[kdepim: 3/3] - 4.5.94.1 (4.6beta4)

[Rex Dieter]

commit 6aca1806f93b120ee9de455d5e10378536b31bf2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 11 15:03:33 2011 -0600

    - 4.5.94.1 (4.6beta4)

 .gitignore  |    2 +-
 kdepim.spec |   25 +++++++++----------------
 sources     |    2 +-
 3 files changed, 11 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9ed1f2b..ee2a88b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kdepim-4.6beta3.tar.bz2
+/kdepim-4.5.94.1.tar.bz2
diff --git a/kdepim.spec b/kdepim.spec
index 6a1d7cd..0ec25b5 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -1,17 +1,14 @@
 
-%define kdepim_version 4.6
-%define pre beta3
-
 Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.5.93
+Version: 4.5.94.1
 Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/kdepim/%{version}/kdepim-%{kdepim_version}%{?pre}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/kdepim/%{version}/kdepim-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # revert http://websvn.kde.org/?view=revision&revision=1072331 (rebased to 4.6)
@@ -21,9 +18,6 @@ Patch10: kdepim_4.4.93_newresultpage_mem_fn-fixbuild.patch
 # upstream patches
 
 Obsoletes: bilbo < 1:1.0
-%if 0%{?fedora} < 13
-Provides:  bilbo = 1:1.0
-%endif
 
 # at least kopete-cryptography and basket_kontact need kdepim-devel to build
 # Obsoletes: kdepim-devel < 6:4.4.90
@@ -35,12 +29,7 @@ Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 # beware bootstrapping (ie, build kdepim-runtime first)
 Requires: kdepim-runtime >= %{version}
 
-%if 0%{?fedora} < 13
-# upgrade path
-Requires: kpilot
-%endif
-
-BuildRequires: akonadi-devel >= 1.4.90
+BuildRequires: akonadi-devel >= 1.4.95
 %global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo %{akonadi_version_min})
 BuildRequires: bison flex
 BuildRequires: boost-devel
@@ -49,7 +38,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gpgme-devel
 BuildRequires: grantlee-devel
-BuildRequires: kdepimlibs-devel >= 4.5.90
+BuildRequires: kdepimlibs-devel >= 4.5.95
 # aka libassuan-devel >= 2.0.0
 BuildRequires: libassuan2-devel
 BuildRequires: libical-devel
@@ -96,8 +85,9 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description devel
 %{summary}.
 
+
 %prep
-%setup -q -n kdepim-%{kdepim_version}%{?pre}
+%setup -q -n kdepim-%{version}%{?pre}
 
 %patch0 -p1 -b .install-headers
 %patch10 -p0
@@ -219,6 +209,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jan 11 2011 Rex Dieter <rdieter at fedoraproject.org> 4.5.94.1-1
+- 4.5.94.1 (4.6beta4)
+
 * Thu Dec 23 2010 Rex Dieter <rdieter at fedoraproject.org> 4.5.93-1
 - 4.5.93 (4.6beta3)
 
diff --git a/sources b/sources
index 7d30290..a17b0d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-200ce58974f0e3694a575dd86ba6e62a  kdepim-4.6beta3.tar.bz2
+f15ee286bb5bc034f5dd607c2b391b54  kdepim-4.5.94.1.tar.bz2