[kdepim/f14/master] revert to kdepim-4.4.5

Wed Aug 11 13:24:12 UTC 2010

commit 19649db7463885617520df0b2f982913114289da
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 11 08:28:37 2010 -0500

    revert to kdepim-4.4.5

 .gitignore  |    2 +-
 kdepim.spec |   70 ++++++++++++++++++++++++++--------------------------------
 sources     |    2 +-
 3 files changed, 33 insertions(+), 41 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index f268dc7..a0b6e00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-kdepim-4.5-beta1.tar.bz2
+kdepim-4.4.5.tar.bz2
diff --git a/kdepim.spec b/kdepim.spec
index 27d9b2e..56ab37c 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -1,27 +1,22 @@
-
-
-%if 0%{?fedora} < 14
 # at least kopete-cryptography needs kdepim-devel to build
-# FIXME?  --Rex
-#define devel 1
-%endif
-
-%define pre beta1
+%define devel 1
 
 Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.5
-Release: 0.2.%{?pre}%{?dist}
+Version: 4.4.5
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/kdepim/kdepim-%{version}%{?pre:-%{pre}}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?devel}
 # revert http://websvn.kde.org/?view=revision&revision=1072331
 Patch0:  kdepim-4.4.0-install-headers.patch
+%endif
 
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
@@ -36,7 +31,7 @@ Provides:  bilbo = 1:1.0
 Provides: kdepim4 = %{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: kdepim-runtime >= %{version}
 
@@ -45,18 +40,20 @@ Requires: kdepim-runtime >= %{version}
 Requires: kpilot
 %endif
 
-BuildRequires: akonadi-devel >= 1.3.80
-%global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo %{akonadi_version_min})
+BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: boost-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gpgme-devel
-BuildRequires: grantlee-devel
-BuildRequires: kdepimlibs-devel >= 4.4.90 
-BuildRequires: libassuan-devel libassuan-static
+BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: libassuan-static, libassuan-devel
 BuildRequires: libical-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
+# TODO: libmapi from http://www.openchange.org/
+#BuildRequires: libmapi-devel
+# Not used, has broken deps to boot -- Rex
+#BuildRequires: libopensync-devel
 BuildRequires: libxslt-devel
 BuildRequires: python-devel
 BuildRequires: soprano-devel
@@ -94,11 +91,8 @@ Install %{name}-devel if you want to write or compile %{name} plugins.
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
+Requires: kdelibs4%{?_isa} >= %{version}
 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}}
 %if ! 0%{?devel}
 Obsoletes: kdepim-devel < 6:4.3.95-1
 %endif
@@ -107,13 +101,11 @@ Obsoletes: kdepim-devel < 6:4.3.95-1
 
 
 %prep
-%setup -q -n kdepim-%{version}%{?pre:-%{pre}}
-
+%setup -q -n kdepim-%{version}%{?alphatag}
 %if 0%{?devel}
 %patch0 -p0 -b .install-headers
 %endif
-## doesn't apply, still needed?  --Rex
-#patch1 -p0 -b .kmail-saveAttachments
+%patch1 -p0 -b .kmail-saveAttachments
 
 
 %build
@@ -130,7 +122,16 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --all-name --with-kde --without-mo
+# make symlinks relative
+mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+pushd %{buildroot}%{_docdir}/HTML/en
+for i in *; do
+   if [ -d $i -a -L $i/common ]; then
+      rm -f $i/common
+      ln -nfs ../common $i
+   fi
+done
+popd
 
 # unpackaged files
 %if ! 0%{?devel}
@@ -171,20 +172,18 @@ fi
 rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%doc README 
+%doc README README.Kolab
 %doc COPYING
 %{_kde4_bindir}/*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/strigi/*.so
 %{_kde4_libdir}/akonadi/contact/editorpageplugins/cryptopageplugin.so
-%{_kde4_datadir}/akonadi/agents/*.desktop
 %{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_appsdir}/akonadiconsole/
 %{_kde4_appsdir}/akregator/
 %{_kde4_appsdir}/blogilo/
-%{_kde4_appsdir}/desktoptheme/default/widgets/*
 %{_kde4_appsdir}/kaddressbook/
 %{_kde4_appsdir}/kalarm/
 %{_kde4_appsdir}/kconf_update/*
@@ -192,7 +191,6 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/kjots/
 %{_kde4_appsdir}/kleopatra/
 %{_kde4_appsdir}/kmail/
-%{_kde4_appsdir}/kmail2/
 %{_kde4_appsdir}/kmailcvt/
 %{_kde4_appsdir}/knode/
 %{_kde4_appsdir}/knotes/
@@ -203,9 +201,8 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/korganizer/
 %{_kde4_appsdir}/ktimetracker/
 %{_kde4_appsdir}/kwatchgnupg/
+%{_kde4_appsdir}/libkdepim/
 %{_kde4_appsdir}/libkleopatra/
-%{_kde4_appsdir}/libmessageviewer/
-%{_kde4_appsdir}/messageviewer/
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_kde4_datadir}/autostart/*.desktop
 %{_kde4_datadir}/config/*rc
@@ -214,6 +211,7 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
+%{_kde4_docdir}/HTML/en/*
 %{_mandir}/man*/*.gz
 
 %files libs
@@ -230,12 +228,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Jul 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5-0.2.beta1
-- Requires: kdebase-runtime
-
-* Fri Jul 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5-0.1.beta1
-- 4.5-beta1
-
 * Tue Jun 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.5-1
 - 4.4.5
 
diff --git a/sources b/sources
index b341775..a1992b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38273d4c88ea967eecaf3ef86fd49ff9  kdepim-4.5-beta1.tar.bz2
+340f47acf0244530ba885cebbc941f6f  kdepim-4.4.5.tar.bz2
