diff --git a/kdepim.spec b/kdepim.spec index 29af21c..f57c0c6 100644 --- a/kdepim.spec +++ b/kdepim.spec @@ -7,7 +7,7 @@ Name: kdepim Summary: PIM (Personal Information Manager) applications Epoch: 6 Version: 4.0.98 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Productivity @@ -105,6 +105,9 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} +# conflict with oxygen-icon-theme +rm -rf %{buildroot}%{_kde4_icondir}/oxygen/32x32/actions/appointment-new.png + # make symlinks relative mkdir -p %{buildroot}%{_docdir}/HTML/en/common pushd %{buildroot}%{_docdir}/HTML/en @@ -173,6 +176,9 @@ rm -rf %{buildroot} %changelog +* Sun Jul 13 2008 Rex Dieter 4.0.98-2 +- fix conflict with oxygen-icon-theme + * Thu Jul 10 2008 Rex Dieter 4.0.98-1 - 4.0.98