diff --git a/kdepim.spec b/kdepim.spec index b298ab8..06e90e4 100644 --- a/kdepim.spec +++ b/kdepim.spec @@ -1,6 +1,8 @@ %define debug 0 %define final 0 +%define kdelibs_epoch 6 +%define kdebase_epoch 6 %define qt_version 1:3.3.5 %define arts_version 8:1.5.2 %define arts 1 @@ -11,7 +13,7 @@ %define disable_gcc_check_and_hidden_visibility 1 Version: 3.5.2 -Release: 1 +Release: 2 Name: kdepim Summary: PIM (Personal Information Manager) for KDE Prefix: /usr @@ -31,14 +33,17 @@ Patch2: kdepim-3.4.0-s390.patch Patch3: kdepim-3.4.0-kandy-icons.patch Patch4: kdepim-3.4.92-libz.patch -Requires: kdebase >= 6:%{version} +# upstream patches +Patch100: kdepim-3.5.2-crash-bz190491.patch + +Requires: kdebase >= %{kdebase_epoch}:%{version} Requires(post,postun): /sbin/ldconfig BuildRequires: perl BuildRequires: bison BuildRequires: flex BuildRequires: desktop-file-utils -BuildRequires: kdebase-devel >= 6:%{version} +BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version} BuildRequires: qt-devel >= %{qt_version} BuildRequires: zlib-devel BuildRequires: libart_lgpl-devel @@ -94,7 +99,7 @@ and accept drag and drop even from remote sites. Summary: Development files for kdepim Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: kdelibs-devel >= 6:%{version} +Requires: kdelibs-devel >= %{kdelibs_epoch}:%{version} %description devel Development files for %{name}. @@ -112,6 +117,9 @@ rm -rf kpilot %patch3 -p1 -b .kandy-icons %patch4 -p1 -b .libz +# upstream patches +%patch100 -p1 -b .crash-bz#190491 + %build unset QTDIR || : ; . /etc/profile.d/qt.sh FLAGS="$RPM_OPT_FLAGS" @@ -200,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/kde/* %changelog +* Wed May 03 2006 Than Ngo 6:3.5.2-2 +- fix #190491, korganizer crashes whenever New Event selected + * Wed Mar 29 2006 Than Ngo 6:3.5.2-1 - update to 3.5.2