diff --git a/kate.spec b/kate.spec index 3f41115..147007f 100644 --- a/kate.spec +++ b/kate.spec @@ -1,7 +1,7 @@ Name: kate Summary: Advanced Text Editor Version: 4.9.90 -Release: 1%{?dist} +Release: 2%{?dist} # kwrite LGPLv2+ # kate: app LGPLv2, plugins, LGPLv2 and LGPLv2+ and GPLv2+ @@ -52,6 +52,8 @@ Summary: Kate kpart plugin License: LGPLv2 # when split occurred Conflicts: kdelibs < 6:4.6.95-10 +# katesyntaxhighlightingrc conflicts with kdelibs3, see http://bugzilla.redhat.com/883529 +Conflicts: kdelibs3 < 3.5.10-40 %description part %{summary}. @@ -132,8 +134,6 @@ fi %{_kde4_iconsdir}/hicolor/*/*/* %{_mandir}/man1/kate.1.gz %{_kde4_configdir}/katerc -%{_kde4_configdir}/kateschemarc -%{_kde4_configdir}/katesyntaxhighlightingrc %{_kde4_datadir}/kde4/services/kate*.desktop %{_kde4_libdir}/kde4/kate*plugin.so %{_kde4_libdir}/kde4/katefiletemplates.so @@ -168,6 +168,8 @@ fi %{_kde4_libdir}/libkatepartinterfaces.so.4* %{_kde4_appsdir}/katepart/ %{_kde4_configdir}/katemoderc +%{_kde4_configdir}/kateschemarc +%{_kde4_configdir}/katesyntaxhighlightingrc %{_kde4_datadir}/kde4/services/katepart.desktop %files -n kwrite -f kwrite.lang @@ -183,6 +185,9 @@ fi %changelog +* Tue Dec 04 2012 Rex Dieter 4.9.90-2 +- kate has a file conflict with kdelibs3 (#883529) + * Mon Dec 03 2012 Rex Dieter 4.9.90-1 - 4.9.90 (4.10 beta2)