rpms/kdepim-runtime/devel .cvsignore, 1.19, 1.20 kdepim-runtime.spec, 1.30, 1.31 sources, 1.20, 1.21

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim-runtime/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28773

Modified Files:
	.cvsignore kdepim-runtime.spec sources 
Log Message:
* Fri Jul 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5-0.1.beta1
- 4.5-beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	30 Jun 2010 13:11:46 -0000	1.19
+++ .cvsignore	2 Jul 2010 15:38:50 -0000	1.20
@@ -1 +1 @@
-kdepim-runtime-4.4.5.tar.bz2
+kdepim-runtime-4.5-beta1.tar.bz2


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/devel/kdepim-runtime.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- kdepim-runtime.spec	30 Jun 2010 13:10:56 -0000	1.30
+++ kdepim-runtime.spec	2 Jul 2010 15:38:50 -0000	1.31
@@ -1,23 +1,24 @@
 
+%define pre beta1
+
 Name:    kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.4.5
-Release: 1%{?dist}
+Version: 4.5
+Release: 0.1%{?pre}%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
 URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/kdepim/kdepim-runtime-%{version}%{?pre:-%{pre}}.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
-
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
-BuildRequires: akonadi-devel
+BuildRequires: akonadi-devel >= 1.3.80
+%global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo %{akonadi_version_min})
 BuildRequires: desktop-file-utils
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libxslt-devel libxml2-devel
@@ -29,17 +30,15 @@ BuildRequires: zlib-devel
 %description
 %{summary}
 
-
 %package libs
 Summary: %{name} runtime libraries
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} >= %{version} 
-
+Requires: akonadi%{?_isa} >= %{akonadi_version}
+%{?_kde4_version:Requires: kdepimlibs-akonadi%{?_isa} >= %{_kde4_version}}
 %description libs
 %{summary}.
 
-
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
@@ -52,7 +51,7 @@ Install %{name}-devel if you want to wri
 
 
 %prep
-%setup -q -n kdepim-runtime-%{version}
+%setup -q -n kdepim-runtime-%{version}%{?pre:-%{pre}}
 
 %patch0 -p1 -b .show-akonadi-kcm
 
@@ -71,36 +70,28 @@ 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-mime-database %{_kde4_datadir}/mime >& /dev/null ||:
 update-desktop-database -q &> /dev/null ||:
+update-mime-database %{_kde4_datadir}/mime >& /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
@@ -117,14 +108,15 @@ rm -rf %{buildroot}
 %{_kde4_bindir}/*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_datadir}/akonadi/agents/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_datadir}/autostart/kaddressbookmigrator.desktop
 %{_kde4_datadir}/config/*rc
 %{_kde4_datadir}/dbus-1/interfaces/*.xml
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/mime/packages/*
+%{_kde4_datadir}/mime/packages/kdepim-mime.xml
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/*
+%{_kde4_appsdir}/akonadi/
+%{_kde4_appsdir}/akonadi_knut_resource/
 
 %files devel
 %defattr(-,root,root,-)
@@ -136,6 +128,9 @@ 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	30 Jun 2010 13:11:46 -0000	1.20
+++ sources	2 Jul 2010 15:38:50 -0000	1.21
@@ -1 +1 @@
-a990c2ab0333ac5c2abf2867c661c86e  kdepim-runtime-4.4.5.tar.bz2
+0bb384fced99272d2d4401acea7b1117  kdepim-runtime-4.5-beta1.tar.bz2