diff --git a/kdelibs.spec b/kdelibs.spec index bd70d21..015eee7 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,7 +1,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.0.72 -Release: 7%{?dist} +Release: 8%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -231,11 +231,7 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \ %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu -%if "%{name}" == "kdelibs" -# kdeui for kde3 -mkdir -p %{buildroot}%{_datadir}/apps -ln -s %{_kde4_appsdir}/kdeui %{buildroot}%{_datadir}/apps/kdeui -%else +%if "%{name}" != "kdelibs" # remove files which conflict with KDE 3 rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \ %{buildroot}%{_kde4_bindir}/kunittestmodrunner @@ -347,7 +343,6 @@ rm -rf %{buildroot} %{_kde4_docdir}/HTML/en/common %{_kde4_datadir}/locale/all_languages/ %{_kde4_appsdir}/kdeui -%{_datadir}/apps/kdeui %endif %files devel @@ -372,6 +367,9 @@ rm -rf %{buildroot} %changelog +* Sat May 24 2008 Rex Dieter - 4.0.72-8 +- revert previous, don't include kde3-compat symlink (here, anyway) + * Fri May 23 2008 Rex Dieter - 4.0.72-7 - -common: provide %%_datadir/apps/kdeui for kde3 apps (#447965)