diff --git a/kde-l10n.spec b/kde-l10n.spec index dea3d34..26d2e5d 100644 --- a/kde-l10n.spec +++ b/kde-l10n.spec @@ -9,7 +9,7 @@ Name: kde-l10n Summary: Internationalization support for KDE Applications Version: 15.12.3 -Release: 3%{?dist} +Release: 4%{?dist} Url: http://www.kde.org License: LGPLv2 @@ -1013,6 +1013,8 @@ for i in $(cat %{SOURCE1000}) ; do if [ -e 4/$i/$j/docs/kdepim/CMakeLists.txt ] ; then sed -i -e 's/add_subdirectory( *kpilot *)/#add_subdirectory(kpilot)/g' 4/$i/$j/docs/kdepim/CMakeLists.txt fi + # omit conflict(s) with plasma-5.6.x + rm -fv 4/$i/$j/messages/kdelibs/kcm_activities.po %if ! 0%{?kdenlive} # rpmfusion not updated to kf5 kdenlive yet, omit from here for now rm -fv 5/$i/$j/messages/kdemultimedia/kdenlive.po @@ -1792,6 +1794,9 @@ rm -rfv %{buildroot}%{_datadir}/locale/*/LC_SCRIPTS/ki18n5/ %changelog +* Mon Apr 11 2016 Rex Dieter - 15.12.3-4 +- omit kcm_activities.mo (#1325724) + * Wed Mar 23 2016 Rex Dieter 15.12.3-3 - restore kdenlive (rpmfusion f23+ updated)