rpms/kdepimlibs/F-9 .cvsignore, 1.25, 1.26 kdepimlibs.spec, 1.49, 1.50 sources, 1.25, 1.26 kdepimlibs-4.1.85-debug-cmake-crash.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Removed Files:
	kdepimlibs-4.1.85-debug-cmake-crash.patch 
Log Message:
* Tue Mar 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
- KDE 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	16 Feb 2009 17:01:33 -0000	1.25
+++ .cvsignore	1 Apr 2009 20:02:02 -0000	1.26
@@ -1,3 +1 @@
-kdepimlibs-4.1.85.tar.bz2
-kdepimlibs-4.1.96.tar.bz2
-kdepimlibs-4.2.0.tar.bz2
+kdepimlibs-4.2.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdepimlibs.spec	27 Feb 2009 18:08:10 -0000	1.49
+++ kdepimlibs.spec	1 Apr 2009 20:02:03 -0000	1.50
@@ -13,10 +13,9 @@
 
 %define akonadi_subpkg 1
 %define akonadi_version 1.1.1
-%define debug 1 
 
 Name: kdepimlibs
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -25,7 +24,6 @@
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
-Patch0: kdepimlibs-4.1.85-debug-cmake-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! 0%{?akonadi_subpkg}
@@ -92,13 +90,12 @@
 
 %prep
 %setup -q -n kdepimlibs-%{version}
-%{?debug:%patch0 -p1}
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} %{?debug:--debug-output} ..
+%{cmake_kde4} ..
 popd
 
 %if 0%{?rest}
@@ -139,9 +136,14 @@
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
+# conflicts with kdepim3 (compat)
+    libkcal.so)
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
 %if 0%{?fedora} < 10
-# conflicts with kdepim3
-    libgpgme++.so | libkcal.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so)
+# conflicts with kdepim(3)
+    libgpgme++.so | libkmime.so | libkpimidentities.so | libktnef.so | libqgpgme.so)
       linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
@@ -215,7 +217,16 @@
 
 
 %changelog
-* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Tue Mar 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-4
+- disable CMake debugging, #475876 should be fixed now
+
+* Tue Mar 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
+- avoid libkcal conflict with kdepim3
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	27 Feb 2009 18:08:10 -0000	1.25
+++ sources	1 Apr 2009 20:02:03 -0000	1.26
@@ -1 +1 @@
-5f220939f33c38992f419d5dfc6874df  kdepimlibs-4.2.1.tar.bz2
+62562a3025138a08ffdf08e6466b5065  kdepimlibs-4.2.2.tar.bz2


--- kdepimlibs-4.1.85-debug-cmake-crash.patch DELETED ---