diff --git a/.cvsignore b/.cvsignore index 848ed04..4135744 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdepim-4.2.1.tar.bz2 +kdepim-4.2.2.tar.bz2 diff --git a/kdepim.spec b/kdepim.spec index 51ed935..83aee97 100644 --- a/kdepim.spec +++ b/kdepim.spec @@ -5,17 +5,14 @@ Name: kdepim Summary: PIM (Personal Information Manager) applications Epoch: 6 -Version: 4.2.1 -Release: 3%{?dist} +Version: 4.2.2 +Release: 2%{?dist} License: GPLv2 Group: Applications/Productivity URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: kdepim-4.1.80-libqgpgme-link-fix.patch -# upstream patches -Patch100: kdepim-4.2.1-imap.patch -Patch101: kdepim-4.2.1-korganizer_view.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,9 +20,6 @@ Provides: kdepim4 = %{version}-%{release} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} -Requires(post): xdg-utils -Requires(postun): xdg-utils - BuildRequires: akonadi-devel BuildRequires: bison flex BuildRequires: boost-devel @@ -95,8 +89,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %patch0 -p1 -b .libqgpgme-link-fix # upstream patches -%patch100 -p0 -b .imap -%patch101 -p4 -b .korganizer_view %build @@ -129,15 +121,22 @@ popd %post -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : -xdg-desktop-menu forceupdate 2> /dev/null || : +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: -%postun -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : -xdg-desktop-menu forceupdate 2> /dev/null || : +%posttrans +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: +update-desktop-database -q &> /dev/null ||: +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: + touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: + gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: + update-desktop-database -q &> /dev/null ||: +fi %post libs -p /sbin/ldconfig @@ -187,6 +186,12 @@ rm -rf %{buildroot} %changelog +* Wed Apr 01 2009 Rex Dieter - 4.2.2-2 +- optimize scriptlets + +* Tue Mar 31 2009 Lukáš Tinkl - 4.2.2-1 +- KDE 4.2.2 + * Mon Mar 09 2009 Rex Dieter 4.2.1-3 - upstream korganizer-view patch diff --git a/sources b/sources index 8872daf..ce35fa0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ebc3730aaee53f494e8e6abd26029bd kdepim-4.2.1.tar.bz2 +964208d570845c75e0c482bb3d33892f kdepim-4.2.2.tar.bz2