rpms/kdepim/devel .cvsignore, 1.83, 1.84 kdepim.spec, 1.280, 1.281 sources, 1.91, 1.92

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kdepim.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/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- .cvsignore	30 Jun 2010 13:09:04 -0000	1.83
+++ .cvsignore	2 Jul 2010 15:45:27 -0000	1.84
@@ -1 +1 @@
-kdepim-4.4.5.tar.bz2
+kdepim-4.5-beta1.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- kdepim.spec	30 Jun 2010 13:09:05 -0000	1.280
+++ kdepim.spec	2 Jul 2010 15:45:28 -0000	1.281
@@ -1,16 +1,22 @@
+
+
+%if 0%{?fedora} < 14
 # at least kopete-cryptography needs kdepim-devel to build
 %define devel 1
+%endif
+
+%define pre beta1
 
 Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
-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-%{version}%{?pre:-%{pre}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?devel}
@@ -40,20 +46,17 @@ Requires: kdepim-runtime >= %{version}
 Requires: kpilot
 %endif
 
-BuildRequires: akonadi-devel
+BuildRequires: akonadi-devel >= 1.3.80
+%global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo %{akonadi_version_min})
 BuildRequires: bison flex
 BuildRequires: boost-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gpgme-devel
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: libassuan-static, libassuan-devel
+BuildRequires: libassuan-devel libassuan-static
 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
@@ -91,8 +94,11 @@ Install %{name}-devel if you want to wri
 %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
@@ -101,11 +107,13 @@ Obsoletes: kdepim-devel < 6:4.3.95-1
 
 
 %prep
-%setup -q -n kdepim-%{version}%{?alphatag}
+%setup -q -n kdepim-%{version}%{?pre:-%{pre}}
+
 %if 0%{?devel}
 %patch0 -p0 -b .install-headers
 %endif
-%patch1 -p0 -b .kmail-saveAttachments
+## doesn't apply, still needed?  --Rex
+#patch1 -p0 -b .kmail-saveAttachments
 
 
 %build
@@ -122,16 +130,7 @@ 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
+%find_lang %{name} --all-name --with-kde --without-mo
 
 # unpackaged files
 %if ! 0%{?devel}
@@ -172,7 +171,7 @@ fi
 rm -rf %{buildroot}
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README README.Kolab
 %doc COPYING
@@ -211,7 +210,6 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
-%{_kde4_docdir}/HTML/en/*
 %{_mandir}/man*/*.gz
 
 %files libs
@@ -228,6 +226,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> - 6:4.4.5-1
 - 4.4.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	30 Jun 2010 13:09:06 -0000	1.91
+++ sources	2 Jul 2010 15:45:28 -0000	1.92
@@ -1 +1 @@
-340f47acf0244530ba885cebbc941f6f  kdepim-4.4.5.tar.bz2
+38273d4c88ea967eecaf3ef86fd49ff9  kdepim-4.5-beta1.tar.bz2