|
|
Author: than
Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29979
Modified Files:
kdepim.spec sources
Added Files:
kdepim-3.5.6-kde#140207.patch
Removed Files:
kdepim-3.5.5-kde#135513.patch
Log Message:
3.5.6
kdepim-3.5.6-kde#140207.patch:
vcalRecord.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE kdepim-3.5.6-kde#140207.patch ---
--- kdepim-3.5.6/kpilot/conduits/vcalconduit/vcalRecord.cc.orig 2007-02-06
18:03:56.000000000 +0100
+++ kdepim-3.5.6/kpilot/conduits/vcalconduit/vcalRecord.cc 2007-02-06
18:04:21.000000000 +0100
@@ -584,7 +584,7 @@
if (eventCategories.size() < 1)
{
// This event has no categories.
- de->setCategory(Pilot::Unfiled);
+ ((PilotRecordBase *)de)->setCategory(Pilot::Unfiled);
return;
}
@@ -623,6 +623,6 @@
}
}
- de->setCategory(Pilot::Unfiled);
+ ((PilotRecordBase *)de)->setCategory(Pilot::Unfiled);
}
Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- kdepim.spec 29 Nov 2006 14:46:21 -0000 1.115
+++ kdepim.spec 6 Feb 2007 17:12:22 -0000 1.116
@@ -4,12 +4,12 @@
%define kdelibs_epoch 6
%define kdebase_epoch 6
%define qt_version 1:3.3.7
-%define arts_version 8:1.5.5
+%define arts_version 8:1.5.6
%define make_cvs 1
%define appdir %{_datadir}/applications/kde
-Version: 3.5.5
+Version: 3.5.6
Release: 1%{?dist}
Name: kdepim
Summary: PIM (Personal Information Manager) for KDE
@@ -27,10 +27,9 @@
Patch2: kdepim-3.4.0-s390.patch
Patch3: kdepim-3.4.0-kandy-icons.patch
Patch4: kdepim-3.4.92-libz.patch
-Patch5: kdepim-3.5.5-automakeversion.patch
-# upstream patches
-Patch100: kdepim-3.5.5-kde#135513.patch
+# upstream fixes
+Patch1000: kdepim-3.5.6-kde#140207.patch
Requires: kdebase >= %{kdebase_epoch}:%{version}
Requires(post): /sbin/ldconfig
@@ -81,10 +80,8 @@
%patch3 -p1 -b .kandy-icons
%patch4 -p1 -b .libz
-%patch5 -p1 -b .amversion
-# upstream patches
-%patch100 -p0 -b .kde#135513
+%patch1000 -p1 -b .kde#140207
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -135,20 +132,18 @@
done
%post
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
%postun
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
%clean
rm -rf %{buildroot}
@@ -196,6 +191,9 @@
%exclude %{_libdir}/libremotekonnector.so
%changelog
+* Tue Feb 06 2007 Than Ngo <than@xxxxxxxxxx> - 6:3.5.6-1.fc7
+- 3.5.6
+
* Wed Nov 29 2006 Karsten Hopp <karsten@xxxxxxxxxx> 3.5.5-1.fc7
- rebuild with new pilot-link libs
- fix automake version check
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources 29 Nov 2006 14:30:22 -0000 1.37
+++ sources 6 Feb 2007 17:12:22 -0000 1.38
@@ -1 +1 @@
-3f2127f74cb496899bb3f1f6f702353b kdepim-3.5.5.tar.bz2
+e37e6173fe9fd7f242c9502a4ae1d7de kdepim-3.5.6.tar.bz2
--- kdepim-3.5.5-kde#135513.patch DELETED ---
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|