diff --git a/kde-l10n.spec b/kde-l10n.spec index c3d0266..ee04d4f 100644 --- a/kde-l10n.spec +++ b/kde-l10n.spec @@ -9,7 +9,7 @@ Name: kde-l10n Summary: Internationalization support for KDE Applications Version: 17.08.3 -Release: 1%{?dist} +Release: 2%{?dist} Url: http://www.kde.org License: LGPLv2 @@ -1011,46 +1011,32 @@ for i in $(cat %{SOURCE1000}) ; do for jj in 4/. 4/${i}/${i}@* ; do j=$(basename ${jj}) if [ -d 4/${i}/${j} ] ; then + # drop: kmouth, keep: jovie + if [ -e 4/$i/$j/docs/kdeaccessibility/CMakeLists.txt ] ; then + sed -i -e 's/add_subdirectory( *kmouth *)/#add_subdirectory(kmouth)/g' 4/$i/$j/docs/kdeaccessibility/CMakeLists.txt + fi # skip kdewebdev for now, because we're still shipping kdewebdev 3 due to Quanta sed -i -e 's/add_subdirectory( *kdewebdev *)/#add_subdirectory(kdewebdev)/g' 4/$i/$j/messages/CMakeLists.txt + # drop: all of kdegames, kdemultimedia, kdesdk, kdeutils, kdewebdev if [ -e 4/$i/$j/docs/CMakeLists.txt ] ; then - sed -i -e 's/add_subdirectory( *kdewebdev *)/#add_subdirectory(kdewebdev)/g' 4/$i/$j/docs/CMakeLists.txt - fi - # remove lilo-config, conflicts with 3.5.10 - rm -fv 4/$i/$j/messages/kdeadmin/kcmlilo.po - if [ -e 4/$i/$j/docs/kdeadmin/CMakeLists.txt ] ; then - sed -i -e 's/add_subdirectory( *lilo-config *)/#add_subdirectory(lilo-config)/g' 4/$i/$j/docs/kdeadmin/CMakeLists.txt + sed -i \ + -e 's/add_subdirectory( *kdegames *)/#add_subdirectory(kdegames)/g' \ + -e 's/add_subdirectory( *kdemultimedia *)/#add_subdirectory(kdemultimedia)/g' \ + -e 's/add_subdirectory( *kdesdk *)/#add_subdirectory(kdesdk)/g' \ + -e 's/add_subdirectory( *kdeutils *)/#add_subdirectory(kdeutils)/g' \ + -e 's/add_subdirectory( *kdewebdev *)/#add_subdirectory(kdewebdev)/g' \ + 4/$i/$j/docs/CMakeLists.txt fi - # remove bogus duplicated kdepim stuff from kdenetwork + # SDK drop: kget, keep: kopete kppp if [ -e 4/$i/$j/docs/kdenetwork/CMakeLists.txt ] ; then - sed -i -e 's/add_subdirectory( *korn *)/#add_subdirectory(korn)/g' -e 's/add_subdirectory( *kmail *)/#add_subdirectory(kmail)/g' -e 's/add_subdirectory( *knode *)/#add_subdirectory(knode)/g' 4/$i/$j/docs/kdenetwork/CMakeLists.txt - fi - # some languages still ship the kpilot stuff - # zap it so the kpilot package can ship all translations itself - rm -fv 4/$i/$j/messages/kdepim/kpilot.po - 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 - # kdegraphics - if [ -e 4/$i/$j/docs/kdegraphics/CMakeLists.txt ] ; then - sed -i -e 's/add_subdirectory( *ksnapshot *)/#add_subdirectory(ksnapshot)/g' 4/$i/$j/docs/kdegraphics/CMakeLists.txt + sed -i -e 's/add_subdirectory( *kget *)/#add_subdirectory(kget)/g' 4/$i/$j/docs/kdenetwork/CMakeLists.txt fi + rm -fv 4/$i/$j/messages/kdeaccessibility/kmouth*.po + rm -fv 4/$i/$j/messages/kdenetwork/*kget*.po + rm -fv 4/$i/$j/messages/kde{games,multimedia,utils}/*.po + # 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 - if [ -e 5/$i/$j/docs/kdemultimedia/CMakeLists.txt ] ; then - sed -i -e 's/^add_subdirectory( *kdenlive *)/#add_subdirectory(kdenlive)/g' 5/$i/$j/docs/kdemultimedia/CMakeLists.txt - fi -%endif -%if ! 0%{?kwave} - # rpmfusion not updated to kf5 kwave yet, omit from here for now - rm -fv 5/$i/$j/messages/kdemultimedia/kwave.po - if [ -e 5/$i/$j/docs/kdemultimedia/CMakeLists.txt ] ; then - sed -i -e 's/^add_subdirectory( *kwave *)/#add_subdirectory(kwave)/g' 5/$i/$j/docs/kdemultimedia/CMakeLists.txt - fi -%endif %if 0%{?omit_plasma5_bits} # Remove translations shipped by Plasma 5 and KDE Frameworks 5 @@ -1058,10 +1044,6 @@ for i in $(cat %{SOURCE1000}) ; do # 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' 4/$i/$j/messages/CMakeLists.txt - if [ -e 4/$i/$j/docs/CMakeLists.txt ]; then - sed -i -e 's/add_subdirectory( *kde-workspace *)/#add_subdirectory(kde-workspace)/g' 4/$i/$j/docs/CMakeLists.txt - fi rm -fv 4/$i/$j/messages/kde-runtime/{attica_kde,knetattach,drkonqi,phonon_kde,soliduiserver}.po rm -fv 4/$i/$j/messages/kde-runtime/kcm{_device_automounter,_emoticons,_nepomuk,_phonon,componentchooser,icons,kded,notify}.po rm -fv 4/$i/$j/messages/kde-runtime/kio_{applications,nepomuk*,remote}.po @@ -1092,8 +1074,6 @@ for i in $(cat %{SOURCE1000}) ; do rm -fv 4/$i/$j/messages/kde-runtime/{filetypes,kcmshell,kdesu,kioclient,kmimetypefinder,kstart,ktraderclient}.po # Provided by khelpcenter rm -fv 4/$i/$j/messages/kde-runtime/{htmlsearch,kcmhtmlsearch,khelpcenter}.po - # Provided by ktp-desktop-applets - rm -fv 4/$i/$j/messages/kdenetwork/plasma_applet_org.kde.ktp-{contact,presence}.po %endif fi @@ -1162,7 +1142,6 @@ rm -rfv %{buildroot}%{_kde4_docdir}/HTML/*/khelpcenter/ %lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/* %lang(ar) %{_datadir}/locale/ar/entry.desktop %lang(ar) %{_datadir}/locale/ar/LC_SCRIPTS/ -#lang(ar) %{_kf5_datadir}/klettres/ar/ %files ast %lang(ast) %{_datadir}/locale/ast/LC_MESSAGES/* @@ -1235,7 +1214,6 @@ rm -rfv %{buildroot}%{_kde4_docdir}/HTML/*/khelpcenter/ %lang(da) %{_datadir}/locale/da/LC_MESSAGES/* %lang(da) %{_datadir}/locale/da/entry.desktop %lang(da) %{_kde4_docdir}/HTML/da/* -%lang(da) %{_mandir}/da/*/* %files de %lang(de) %{_datadir}/locale/de/LC_MESSAGES/* @@ -1328,7 +1306,6 @@ rm -rfv %{buildroot}%{_kde4_docdir}/HTML/*/khelpcenter/ %files he %lang(he) %{_datadir}/locale/he/LC_MESSAGES/* %lang(he) %{_datadir}/locale/he/entry.desktop -#lang(he) %{_kf5_datadir}/klettres/he/ %lang(he) %{_kde4_docdir}/HTML/he/* %files hi @@ -1460,7 +1437,6 @@ rm -rfv %{buildroot}%{_kde4_docdir}/HTML/*/khelpcenter/ %lang(ml) %{_datadir}/locale/ml/LC_MESSAGES/* %lang(ml) %{_datadir}/locale/ml/LC_SCRIPTS/ %lang(ml) %{_datadir}/locale/ml/entry.desktop -#lang(ml) %{_kde4_appsdir}/klettres/ml/ %endif %if %{buildall} @@ -1654,6 +1630,9 @@ rm -rfv %{buildroot}%{_kde4_docdir}/HTML/*/khelpcenter/ %changelog +* Wed Jan 17 2018 Rex Dieter - 17.08.3-2 +- omit conflicts with kde-apps-17.12.x (#1535288) + * Wed Nov 08 2017 Rex Dieter - 17.08.3-1 - 17.08.3