rpms/kdepimlibs/F-10 kdepimlibs-4.1.85-debug-cmake-crash.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 kdepimlibs.spec, 1.57, 1.58 sources, 1.29, 1.30 kdepimlibs-4.1.4-system-libical.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Fri Jan 23 20:40:24 UTC 2009 

Author: rdieter

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

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Added Files:
	kdepimlibs-4.1.85-debug-cmake-crash.patch 
Removed Files:
	kdepimlibs-4.1.4-system-libical.patch 
Log Message:
sync w/devel branch for kde-4.2 hotness


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

--- NEW FILE kdepimlibs-4.1.85-debug-cmake-crash.patch ---
diff -ur kdepimlibs-4.1.85/qgpgme/CMakeLists.txt kdepimlibs-4.1.85-debug-cmake-crash/qgpgme/CMakeLists.txt
--- kdepimlibs-4.1.85/qgpgme/CMakeLists.txt	2008-12-04 09:34:05.000000000 +0100
+++ kdepimlibs-4.1.85-debug-cmake-crash/qgpgme/CMakeLists.txt	2008-12-12 15:54:33.000000000 +0100
@@ -1,9 +1,13 @@
 
+message( STATUS "qgpgme section 1" )
+
 set( _any_gpgme_found false )
 
 set( _qgpgme_version 1.0.1 )
 set( _qgpgme_soversion 1 )
 
+message( STATUS "qgpgme section 2" )
+
 if ( WIN32 AND GPGME_VANILLA_FOUND )
 
    # on Windows, we require gpgme(-vanilla), which is thread-safe,
@@ -15,6 +19,8 @@
 
 endif ( WIN32 AND GPGME_VANILLA_FOUND )
 
+message( STATUS "qgpgme section 3" )
+
 if ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
 
    # on Unix, we requrie gpgme-pthread (for convenience, since vanilla
@@ -30,6 +36,8 @@
 
 # build / install only if any useable gpgme was found:
 
+message( STATUS "qgpgme section 4" )
+
 if ( _any_gpgme_found )
 
    include_directories( ${GPGME_INCLUDES} ${CMAKE_SOURCE_DIR}/gpgme++ ${Boost_INCLUDE_DIR} )
@@ -59,3 +67,5 @@
      DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme COMPONENT Devel )
 
 endif ( _any_gpgme_found )
+
+message( STATUS "qgpgme end" )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	8 Jan 2009 10:07:30 -0000	1.28
+++ .cvsignore	23 Jan 2009 20:39:54 -0000	1.29
@@ -1 +1,3 @@
-kdepimlibs-4.1.4.tar.bz2
+kdepimlibs-4.1.85.tar.bz2
+kdepimlibs-4.1.96.tar.bz2
+kdepimlibs-4.2.0.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdepimlibs.spec	8 Jan 2009 10:20:28 -0000	1.57
+++ kdepimlibs.spec	23 Jan 2009 20:39:54 -0000	1.58
@@ -11,15 +11,10 @@
 %define rest 1
 #endif
 
-%if 0%{?fedora} >= 9
-# Use system libical (requires libical-devel >= 0.33)
-# Disabled for now because of #469228
-%define with_libical 1
-%endif
+%define akonadi_version 1.1.1
 
 Name: kdepimlibs
-
-Version: 4.1.4
+Version: 4.2.0
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -28,24 +23,24 @@
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
-# Use system libical (will be in 4.2)
-Patch100:      kdepimlibs-4.1.4-system-libical.patch
+Patch0: kdepimlibs-4.1.85-debug-cmake-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires: akonadi >= %{akonadi_version}
 Requires: kdelibs4 >= %{version}
 
-BuildRequires: akonadi-devel
+BuildRequires: akonadi-devel >= %{akonadi_version} 
 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
+# pulling in phonon-backend-xine
+#BuildRequires: phonon-backend-gstreamer
 
 ## upstream patches
 
@@ -61,12 +56,14 @@
 
 %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}
 Requires: kdelibs4-devel
 Requires: boost-devel
+# FIXME/HACK, bogus dep -- Rex
+Requires: libical-devel
 
 %description devel
 Header files for developing applications using %{name}.
@@ -83,18 +80,13 @@
 
 %prep
 %setup -q -n kdepimlibs-%{version}
-%if 0%{?with_libical}
-# use system libical
-%patch100 -p1
-rm -rf kcal/libical
-%endif
-
+%patch0 -p1
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} --debug-output ..
 popd
 
 %if 0%{?rest}
@@ -112,7 +104,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
@@ -145,7 +137,7 @@
 
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 
 %if 0%{?rest}
@@ -153,9 +145,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/*
@@ -163,14 +152,27 @@
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
-%{_kde4_libdir}/gpgmepp/
 %exclude %{_kde4_libdir}/kde4/devel/
+%{_kde4_libdir}/gpgmepp/
+%{_kde4_docdir}/HTML/en/*
+%if 0%{?apidocs}
+%exclude %{_kde4_docdir}/HTML/en/kdepimlibs-apidocs/
+%endif
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
+
+# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
+# and F10's cmake (2.6.2) -- Lorenzo
+%if 0%{?fedora} > 10
+%{_kde4_libdir}/cmake/KdepimLibs*
+%else
+%{_kde4_libdir}/KdepimLibs*
+%endif
+%{_kde4_libdir}/gpgmepp/
 %endif
 
 %if 0%{?apidocs}
@@ -181,11 +183,41 @@
 
 
 %changelog
-* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
-- update to 4.1.4
-- reenable system libical, #469228 reportedly fixed upstream now
-- also use the system libical on F9
-- rebase system-libical patch (some line endings changed from CR LF to LF)
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+- exclude kdepimlibs-apidocs from main pkg
+
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.96-2
+- fix build on Fedora 10 (cmake < 2.6.3 seems to have a different
+  behaviour here)
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Wed Dec 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-2
+- versioned akonadi(-devel) deps
+
+* Thu Dec 11 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.85-1
+- KDE 4.2beta2
+
+* Wed Dec 10 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.82-2
+- add --debug-output to our cmake call, that should fix a reproducible
+  bug with cmake and ppc builds (this work-around should be
+  removed anyway)
+
+* Tue Dec 09 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.82-1
+- 4.1.82
+
+* Tue Dec 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
+- -devel: Requires: libical-devel
+
+* 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
@@ -367,7 +399,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/pkgs/rpms/kdepimlibs/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	8 Jan 2009 10:07:32 -0000	1.29
+++ sources	23 Jan 2009 20:39:54 -0000	1.30
@@ -1 +1 @@
-9546430309b1f34707bffdceec0fbc4b  kdepimlibs-4.1.4.tar.bz2
+8a91677e2dca7d4db26b33c78e239e5e  kdepimlibs-4.2.0.tar.bz2


--- kdepimlibs-4.1.4-system-libical.patch DELETED ---

More information about the fedora-extras-commits mailing list