rpms/kdepimlibs/devel .cvsignore, 1.27, 1.28 kdepimlibs.spec, 1.54, 1.55 sources, 1.27, 1.28 kdepimlibs-4.1.2-system-libical.patch, 1.1, NONE

[Than Ngo]

Author: than

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

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Removed Files:
	kdepimlibs-4.1.2-system-libical.patch 
Log Message:
4.2 beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Sep 2008 19:39:33 -0000	1.27
+++ .cvsignore	20 Nov 2008 15:53:50 -0000	1.28
@@ -1 +1,2 @@
 kdepimlibs-4.1.2.tar.bz2
+kdepimlibs-4.1.80.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdepimlibs.spec	1 Nov 2008 03:02:23 -0000	1.54
+++ kdepimlibs.spec	20 Nov 2008 15:53:50 -0000	1.55
@@ -11,17 +11,10 @@
 %define rest 1
 #endif
 
-%if 0
-#if 0%{?fedora} > 9
-# Use system libical (requires libical-devel >= 0.33)
-# Disabled for now because of #469228
-%define with_libical 1
-%endif
-
 Name: kdepimlibs
 
-Version: 4.1.2
-Release: 4%{?dist}
+Version: 4.1.80
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -29,26 +22,20 @@
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
-# Use system libical (will be in 4.2)
-Patch100:      kdepimlibs-4.1.2-system-libical.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: kdelibs4 >= %{version}
 
 BuildRequires: akonadi-devel
 BuildRequires: boost-devel
-BuildRequires: cmake
 BuildRequires: cyrus-sasl-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel libXtst-devel
 BuildRequires: openldap-devel
-%if 0%{?with_libical}
 BuildRequires: libical-devel >= 0.33
-%endif
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
-# work around circular dependency from kdelibs4-devel 
+# work around circular dependency from kdelibs4-devel
 # pulling in phonon-backend-xine
 #BuildRequires: phonon-backend-gstreamer
 
@@ -66,7 +53,7 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name} = %{version}-%{release}
 Obsoletes: kdepimlibs4-devel < %{version}-%{release}
 Provides:  kdepimlibs4-devel = %{version}-%{release}
@@ -88,12 +75,6 @@
 
 %prep
 %setup -q -n kdepimlibs-%{version}
-%if 0%{?with_libical}
-# use system libical
-%patch100 -p1
-rm -rf kcal/libical
-%endif
-
 
 %build
 
@@ -117,7 +98,7 @@
 rm -rf %{buildroot}
 
 %if 0%{?rest}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
@@ -150,7 +131,7 @@
 
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 
 %if 0%{?rest}
@@ -158,9 +139,6 @@
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/akonadi-kde/
 %{_kde4_appsdir}/kabc/
-%if !0%{?with_libical}
-%{_kde4_appsdir}/libical/
-%endif
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
@@ -169,6 +147,7 @@
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/gpgmepp/
+%{_kde4_docdir}/HTML/en/*
 %exclude %{_kde4_libdir}/kde4/devel/
 
 %files devel
@@ -186,6 +165,17 @@
 
 
 %changelog
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake 2.6
+- make install/fast
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
 * Sat Nov 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-4
 - turn off system libical for now, crashes KOrganizer (#469228)
 
@@ -363,7 +353,7 @@
 - dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
 - compiling with QA_RPATHS=0x0003; export QA_RPATHS
 - added libXtst-devel libXpm-devel as BR
-	
+
 * Fri Nov 24 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
 - parallel build support
 - added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	26 Sep 2008 19:39:33 -0000	1.27
+++ sources	20 Nov 2008 15:53:50 -0000	1.28
@@ -1 +1 @@
-c5896119ce4aef2dd9d11495dd0dea6e  kdepimlibs-4.1.2.tar.bz2
+8090760c6a43756160d1436676f1a305  kdepimlibs-4.1.80.tar.bz2


--- kdepimlibs-4.1.2-system-libical.patch DELETED ---