rpms/kdepimlibs/devel .cvsignore, 1.48, 1.49 kdepimlibs.spec, 1.111, 1.112 sources, 1.46, 1.47

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29872

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
- 4.3.85 (4.4 beta2)
- tighten deps



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	2 Dec 2009 13:54:42 -0000	1.48
+++ .cvsignore	18 Dec 2009 16:36:48 -0000	1.49
@@ -1 +1 @@
-kdepimlibs-4.3.80.tar.bz2
+kdepimlibs-4.3.85.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- kdepimlibs.spec	16 Dec 2009 16:08:46 -0000	1.111
+++ kdepimlibs.spec	18 Dec 2009 16:36:48 -0000	1.112
@@ -1,10 +1,11 @@
+
 %define apidocs 1
 %define akonadi_subpkg 1
-%define akonadi_version 1.2.61
+%define akonadi_version 1.2.80
 
 Name: kdepimlibs
-Version: 4.3.80
-Release: 2%{?dist}
+Version: 4.3.85
+Release: 1%{?dist}
 Summary: KDE PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -16,10 +17,11 @@ Source0: ftp://ftp.kde.org/pub/kde/unsta
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! 0%{?akonadi_subpkg}
-Provides: %{name}-akonadi%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-akonadi < %{version}-%{release}
+Provides:  %{name}-akonadi = %{version}-%{release}
 Requires: akonadi%{?_isa} >= %{akonadi_version}
 %endif
-Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 
 BuildRequires: akonadi-devel >= %{akonadi_version}
 BuildRequires: boost-devel
@@ -47,7 +49,7 @@ 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}
@@ -56,7 +58,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}.
@@ -66,7 +68,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}.
@@ -182,11 +184,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}
@@ -197,6 +195,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	2 Dec 2009 13:54:42 -0000	1.46
+++ sources	18 Dec 2009 16:36:48 -0000	1.47
@@ -1 +1 @@
-e7dee79a6ca9393ef9fdbcdd0614e611  kdepimlibs-4.3.80.tar.bz2
+b93ec318798eaa7ccceb622310b66211  kdepimlibs-4.3.85.tar.bz2