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

[Rex Dieter]

commit 87905d32d07f295ddbbd3e3d12f2b0c5cd4d1cb9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 11 08:29:57 2010 -0500

    revert to 4.4.5

 .gitignore                                      |    2 +-
 kdepim-runtime-4.5-beta1-accountwizard_dt.patch |   12 -----
 kdepim-runtime.spec                             |   50 ++++++++++++-----------
 sources                                         |    2 +-
 4 files changed, 28 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b160e7..080f21f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-kdepim-runtime-4.5-beta1.tar.bz2
+kdepim-runtime-4.4.5.tar.bz2
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index d4a1496..1bf3824 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -1,28 +1,25 @@
 
-%define pre beta1
-
 Name:    kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.5
-Release: 0.1.%{?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-runtime-%{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)
 
 # show the Akonadi KCM in System Settings (#565420)
 Patch0: kdepim-runtime-4.4.0-show-akonadi-kcm.patch
+
 # upstream patches
-Patch100: kdepim-runtime-4.5-beta1-accountwizard_dt.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
-BuildRequires: akonadi-devel >= 1.3.80
-%global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo %{akonadi_version_min})
+BuildRequires: akonadi-devel
 BuildRequires: desktop-file-utils
-BuildRequires: kdepimlibs-devel >= 4.4.90 
+BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libxslt-devel libxml2-devel
 BuildRequires: shared-desktop-ontologies
 BuildRequires: soprano-devel
@@ -32,15 +29,17 @@ BuildRequires: zlib-devel
 %description
 %{summary}
 
+
 %package libs
 Summary: %{name} runtime libraries
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: akonadi%{?_isa} >= %{akonadi_version}
-%{?_kde4_version:Requires: kdepimlibs-akonadi%{?_isa} >= %{_kde4_version}}
+Requires: kdepimlibs-akonadi%{?_isa} >= %{version} 
+
 %description libs
 %{summary}.
 
+
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
@@ -53,10 +52,9 @@ Install %{name}-devel if you want to write or compile %{name} plugins.
 
 
 %prep
-%setup -q -n kdepim-runtime-%{version}%{?pre:-%{pre}}
+%setup -q -n kdepim-runtime-%{version}
 
 %patch0 -p1 -b .show-akonadi-kcm
-%patch100 -p1 -b .accountwizard_dt
 
 
 %build
@@ -73,28 +71,36 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# 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
 
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
    desktop-file-validate $f
 done
 
-
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-update-desktop-database -q &> /dev/null ||:
 update-mime-database %{_kde4_datadir}/mime >& /dev/null ||:
-
+update-desktop-database -q &> /dev/null ||:
 
 %postun
 if [ $1 -eq 0 ] ; then
+  update-mime-database %{_kde4_datadir}/mime &> /dev/null ||:
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   update-desktop-database -q &> /dev/null ||:
-  update-mime-database %{_kde4_datadir}/mime &> /dev/null ||:
 fi
 
 %post libs -p /sbin/ldconfig
@@ -111,15 +117,14 @@ rm -rf %{buildroot}
 %{_kde4_bindir}/*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_datadir}/akonadi/agents/*
-%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/autostart/kaddressbookmigrator.desktop
 %{_kde4_datadir}/config/*rc
 %{_kde4_datadir}/dbus-1/interfaces/*.xml
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/mime/packages/*.xml
+%{_kde4_datadir}/mime/packages/*
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/akonadi/
-%{_kde4_appsdir}/akonadi_knut_resource/
+%{_kde4_appsdir}/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -131,9 +136,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* 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> - 4.4.5-1
 - 4.4.5
 
diff --git a/sources b/sources
index 04aad5b..0189241 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0bb384fced99272d2d4401acea7b1117  kdepim-runtime-4.5-beta1.tar.bz2
+a990c2ab0333ac5c2abf2867c661c86e  kdepim-runtime-4.4.5.tar.bz2