rpms/kdepimlibs/F-11 .cvsignore, 1.43, 1.44 kdepimlibs.spec, 1.96, 1.97 sources, 1.43, 1.44

Wed Feb 10 14:17:58 UTC 2010

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10455/F-11

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
sync w/devel branch for 4.4.0 goodness



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-11/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44

--- .cvsignore	25 Jan 2010 18:20:15 -0000	1.43
+++ .cvsignore	10 Feb 2010 14:17:58 -0000	1.44
@@ -1 +1,2 @@
-kdepimlibs-4.3.5.tar.bz2
+kdepimlibs-4.3.98.tar.bz2
+kdepimlibs-4.4.0.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-11/kdepimlibs.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- kdepimlibs.spec	25 Jan 2010 18:20:15 -0000	1.96
+++ kdepimlibs.spec	10 Feb 2010 14:17:58 -0000	1.97
@@ -1,28 +1,32 @@
+
 %define apidocs 1
 %define akonadi_subpkg 1
-%define akonadi_version 1.2.1
+%define akonadi_version_min 1.3.1
+
+%global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo %{akonadi_version_min})
 
 Name: kdepimlibs
-Version: 4.3.5
-Release: 1%{?dist}
-Summary: K Desktop Environment 4 - PIM Libraries
+Version: 4.4.0
+Release: 2%{?dist}
+Summary: KDE PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
 Group: System Environment/Libraries
+
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstream patches
-
 %if ! 0%{?akonadi_subpkg}
-Provides: %{name}-akonadi%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-akonadi < %{version}-%{release}
+Provides:  %{name}-akonadi = %{version}-%{release}
+%{?_isa:Provides:  %{name}-akonadi%{_isa} = %{version}-%{release}}
 Requires: akonadi%{?_isa} >= %{akonadi_version}
 %endif
-Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 
-BuildRequires: akonadi-devel >= %{akonadi_version} 
+BuildRequires: akonadi-devel >= %{akonadi_version_min}
 BuildRequires: boost-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: gpgme-devel
@@ -41,15 +45,14 @@ BuildRequires: qt4-doc
 Conflicts: kdepim < 6:4.2.90
 
 %description
-Personal Information Management (PIM) libraries for the
-K Desktop Environment 4.
+Personal Information Management (PIM) libraries for KDE 4.
 
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
 Requires: %{name} = %{version}-%{release}
 %if 0%{?akonadi_subpkg}
-Requires: %{name}-akonadi = %{version}-%{release}
+Requires: %{name}-akonadi%{?_isa} = %{version}-%{release}
 %endif
 Obsoletes: kdepimlibs4-devel < %{version}-%{release}
 Provides:  kdepimlibs4-devel = %{version}-%{release}
@@ -58,7 +61,7 @@ Requires: boost-devel
 # FIXME/HACK, bogus dep -- Rex
 # Is this still needed now that we have "reduced link interfaces"? I think
 # users of libkcal no longer try to link in libical.so now. -- Kevin
-Requires: libical-devel
+#Requires: libical-devel
 
 %description devel
 Header files for developing applications using %{name}.
@@ -68,7 +71,7 @@ Summary: Akonadi runtime support for %{n
 Group: System Environment/Libraries
 # when pkg split occurrs, not sure if this is really needed, but... -- Rex
 #Obsoletes: kdepimlibs < 4.2.0-3
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: akonadi%{?_isa} >= %{akonadi_version}
 %description akonadi
 %{summary}.
@@ -85,7 +88,7 @@ format for easy browsing.
 
 
 %prep
-%setup -q -n kdepimlibs-%{version}
+%setup -q
 
 
 %build
@@ -142,7 +145,7 @@ popd
 # install apidocs
 %if 0%{?apidocs}
 mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
-cp -prf kdepimlibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs
+cp -prf kdepimlibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdepimlibs-apidocs
 %endif
 
 
@@ -167,6 +170,7 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kioslave/
+%{_kde4_appsdir}/akonadi/
 %{_kde4_appsdir}/libkholidays/
 %{_kde4_datadir}/mime/packages/kdepimlibs-mime.xml
 %if 0%{?akonadi_subpkg}
@@ -183,11 +187,7 @@ rm -rf %{buildroot}
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
 %{_kde4_libdir}/lib*.so
-%if "%{?_cmake_version}" > "2.6.2"
 %{_kde4_libdir}/cmake/KdepimLibs*
-%else
-%{_kde4_libdir}/KdepimLibs*
-%endif
 %{_kde4_libdir}/gpgmepp/
 
 %if 0%{?apidocs}
@@ -198,14 +198,46 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Jan 22 2010 Rex Dieter <rdieter at fedoraprojedct.org> - 4.3.5-1
-- 4.3.5
+* Tue Feb 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-2
+- akonadi_version 1.3.1
+
+* Fri Feb 05 2010 Than Ngo <than at redhat.com> - 4.4.0-1
+- 4.4.0
+
+* Sun Jan 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-1
+- KDE 4.3.98 (4.4rc3)
+
+* Wed Jan 20 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.3.95-1
+- KDE 4.3.95 (4.4rc2)
+
+* Sat Jan 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-4 
+- rebuild (boost)
+
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-3
+- revive -akonadi
+
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-2
+- akonadi_ver 1.2.90
+
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
+- 4.3.90 (4.4 rc1)
+- drop -akonadi subpkg
+
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- 4.3.85 (4.4 beta2)
+- tighten deps
+
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
+- Repositioning the KDE Brand (#547361)
+
+* Tue Dec  1 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
 
-* Wed Jan 13 2010 Rex Dieter <rdieter at fedoraproject.rog> - 4.3.4-2
-- kio_imap4 eats randomly too much cpu (kde#203715)
+* Sat Nov 21 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
+- Update to 4.3.75 snapshot
 
-* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
-- 4.3.4
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-3
+- rebuild (qt-4.6.0-rc1, fc13+)
 
 * Fri Nov 13 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - rhel cleanup, remove Fedora<=9 conditionals


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-11/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	25 Jan 2010 18:20:15 -0000	1.43
+++ sources	10 Feb 2010 14:17:58 -0000	1.44
@@ -1 +1 @@
-bac3b6c50fc75408b39b401a6f2e6064  kdepimlibs-4.3.5.tar.bz2
+2eb04e5ae39a25009f036ec333eb118a  kdepimlibs-4.4.0.tar.bz2

