diff --git a/kde-l10n.spec b/kde-l10n.spec index a2b4ccc..aac0ad9 100644 --- a/kde-l10n.spec +++ b/kde-l10n.spec @@ -3,7 +3,7 @@ Name: kde-l10n Summary: Internationalization support for KDE Version: 4.14.3 -Release: 2%{?dist} +Release: 3%{?dist} Url: http://www.kde.org License: LGPLv2 @@ -823,6 +823,31 @@ for i in $(cat %{SOURCE1000}) ; do if [ -e $j/docs/kdepim/CMakeLists.txt ] ; then sed -i -e 's/add_subdirectory( *kpilot *)/#add_subdirectory(kpilot)/g' $j/docs/kdepim/CMakeLists.txt fi + + # Remove translations shipped by Plasma 5 and KDE Frameworks 5 + # Each Plasma 5 and KF5 app/library ship their own translations in their tarballs, so they + # often conflict with kde-l10n, since most of the catalogs still have the same name + + # Provided by plasma-workspace and plasma-desktop + sed -i -e 's/add_subdirectory( *kde-workspace *)/#add_subdirectory(kde-workspace)/g' $j/messages/CMakeLists.txt + rm -f $j/messages/kde-runtime/{attica_kde,knetattach,drkonqi,phonon_kde,soliduiserver}.po + rm -f $j/messages/kde-runtime/kcm{_emoticons,_phonon,componentchooser,icons,kded,notify}.po + rm -f $j/messages/kde-runtime/kio_{applications,remote}.po + rm -f $j/messages/kdelibs/{kcm_baloofile,plasma_runner_baloosearchrunner}.po + rm -f $j/messages/applications/useraccount.po + # Provided by kdeplasma-addons + sed -i -e 's/add_subdirectory( *kdeplasma-addons *)/#add_subdirectory(kdeplasma-addons)/g' $j/messages/CMakeLists.txt + # Provided by kf5-kfilemetada + rm -f $j/messages/kdelibs/kfilemetadata.po + # Provided by kf5-baloo + rm -f $j/messages/kdelibs/kio_{baloosearch,tags,timeline}.po + rm -f $j/messages/kdelibs/baloo{search,show,_file,_file_extractor}.po + # Provided by kio-extras + rm -f $j/messages/kde-runtime/kio_{archive,bookmarks,fish,info,man,nfs,recentdocuments,sftp,smb,thumbnail}.po + # Provided by kde-cli-tools + rm -f $j/messages/kde-runtime/{filetypes,kcmshell,kdesu,kioclient,kmimetypefinder,kstart,ktraderclient}.po + # Provided by khelpcenter + rm -f $j/messages/kde-runtime/{htmlsearch,kcmhtmlsearch,khelpcenter}.po fi done mkdir -p %{_target_platform} @@ -1469,6 +1494,9 @@ rm -fv %{buildroot}%{_datadir}/locale/tr/ceviri_uygula.sh %changelog +* Wed Jan 28 2015 Daniel Vrátil - 4.14.3-3 +- Remove catalogs conflicting with Plasma 5 + * Thu Jan 15 2015 Parag Nemade - 4.14.3-2 - Use langcodes instead of language names in subpackages (#1170730)