commit cc7027cd9de9180c59cebc9fa4e604557dcb479c
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Thu Jun 30 15:59:37 2011 -0500
4.6.90
.gitignore | 1 +
kdepim.spec | 28 ++++++++++------------------
sources | 2 +-
3 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f7c67fa..ef0a86b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/kdepim-4.6.0.tar.bz2
+/kdepim-4.6.90.tar.bz2
diff --git a/kdepim.spec b/kdepim.spec
index 19768d8..1c7b617 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -2,13 +2,13 @@
Name: kdepim
Summary: KDE PIM (Personal Information Manager) applications
Epoch: 7
-Version: 4.6.0
-Release: 2%{?dist}
+Version: 4.6.90
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Productivity
URL:
http://www.kde.org/
-Source0:
ftp://ftp.kde.org/pub/kde/stable/kdepim-%{version}/src/kdepim-%{version}%...
+Source0:
ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepim-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# revert
http://websvn.kde.org/?view=revision&revision=1072331 (rebased to 4.6)
@@ -16,19 +16,14 @@ Patch0: kdepim-4.5.85-install-headers.patch
# upstream patches
-Obsoletes: bilbo < 1:1.0
-
Provides: kdepim4 = %{version}-%{release}
-# kdepim includes it's own translations now (vs. kdepim-4.4.x)
-Provides: kde-l10n-kdepim = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
# beware bootstrapping (ie, build kdepim-runtime first)
Requires: kdepim4-runtime >= %{version}
-BuildRequires: akonadi-devel >= 1.5.0
-%global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo
'1.4.95')
+BuildRequires: akonadi-devel >= 1.5.80
BuildRequires: bison flex
BuildRequires: boost-devel
BuildRequires: chrpath
@@ -37,8 +32,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gpgme-devel
BuildRequires: grantlee-devel
-BuildRequires: kdepimlibs-devel >= 4.5.95
-# aka libassuan-devel >= 2.0.0
+BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: libassuan2-devel
BuildRequires: libical-devel
BuildRequires: libXpm-devel libXScrnSaver-devel
@@ -74,10 +68,7 @@ Requires: spambayes
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-## these two should already be included in kdepim-runtime, so let's leave
-## them out here for now -- Rex
-#Requires: akonadi%{?_isa} >= %{akonadi_version}
-#%{?_kde4_version:Requires: kdepimlibs-akonadi%{?_isa} >= %{_kde4_version}}
+#{?_kde4_version:Requires: kdepimlibs-akonadi%{?_isa} >= %{_kde4_version}}
%description libs
%{summary}.
@@ -115,8 +106,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
chrpath --list %{buildroot}%{_kde4_bindir}/kabc2mutt && \
chrpath --delete %{buildroot}%{_kde4_bindir}/kabc2mutt
-%find_lang %{name} --all-name --with-kde
-
%check
for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -151,7 +140,7 @@ fi
rm -rf %{buildroot}
-%files -f %{name}.lang
+%files
%defattr(-,root,root,-)
%doc README
%doc COPYING
@@ -209,6 +198,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Jun 30 2011 Rex Dieter <rdieter(a)fedoraproject.org> 7:4.6.90-1
+- 4.6.90
+
* Wed Jun 29 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 7:4.6.0-2
- Disable kdepim-mobile until it actually works (#717694)
diff --git a/sources b/sources
index bbb4f34..904507a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72396ca638233f52fcc69cac74fcc06d kdepim-4.6.0.tar.bz2
+4f881030b6e752600c6cecf57a7f826c kdepim-4.6.90.tar.bz2