From b75ae2c8e1e0394cedb8311dc44e4fea850e54fc Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Dec 10 2015 09:47:38 +0000 Subject: Update to 15.11.90 --- diff --git a/.gitignore b/.gitignore index 4504c08..981dc8a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /kdepim-4.14.8.tar.xz /kdepim-4.14.9.tar.xz /kdepim-4.14.10.tar.xz +/kdepim-15.11.90.tar.xz diff --git a/kdepim-4.11.90-install_kleopatra_headers.patch b/kdepim-4.11.90-install_kleopatra_headers.patch deleted file mode 100644 index ab5fce5..0000000 --- a/kdepim-4.11.90-install_kleopatra_headers.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt ---- kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 -+++ kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt 2013-11-16 13:17:30.289810575 -0600 -@@ -6,3 +6,7 @@ add_subdirectory(gui) - - add_subdirectory(tests) - -+install( -+ FILES kleopatraclient_export.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient -+ ) -diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt ---- kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 -+++ kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 -@@ -72,3 +72,13 @@ else() - endif() - - install(TARGETS kleopatraclientcore ${INSTALL_TARGETS_DEFAULT_ARGS}) -+ -+install( -+ FILES -+ initialization.h -+ command.h -+ selectcertificatecommand.h -+ signencryptfilescommand.h -+ decryptverifyfilescommand.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core -+ ) -diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt ---- kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 -+++ kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 -@@ -16,3 +16,9 @@ set_target_properties(kleopatraclientgui - ) - - install(TARGETS kleopatraclientgui ${INSTALL_TARGETS_DEFAULT_ARGS}) -+ -+install( -+ FILES -+ certificaterequester.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui -+ ) -diff -up kdepim-4.11.90/libkleo/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/libkleo/CMakeLists.txt ---- kdepim-4.11.90/libkleo/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 -+++ kdepim-4.11.90/libkleo/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 -@@ -121,3 +121,61 @@ install ( FILES libkleopatrarc-win32.des - else () - install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc ) - endif () -+ -+install( FILES -+ kleo/kleo_export.h -+ kleo/enum.h -+ kleo/oidmap.h -+ kleo/cryptobackend.h -+ kleo/cryptobackendfactory.h -+ kleo/cryptoconfig.h -+ kleo/dn.h -+ kleo/job.h -+ kleo/keylistjob.h -+ kleo/keygenerationjob.h -+ kleo/abstractimportjob.h -+ kleo/importjob.h -+ kleo/importfromkeyserverjob.h -+ kleo/exportjob.h -+ kleo/changeexpiryjob.h -+ kleo/changeownertrustjob.h -+ kleo/downloadjob.h -+ kleo/deletejob.h -+ kleo/encryptjob.h -+ kleo/decryptjob.h -+ kleo/signjob.h -+ kleo/specialjob.h -+ kleo/verifydetachedjob.h -+ kleo/verifyopaquejob.h -+ kleo/decryptverifyjob.h -+ kleo/signencryptjob.h -+ kleo/signkeyjob.h -+ kleo/adduseridjob.h -+ kleo/refreshkeysjob.h -+ kleo/multideletejob.h -+ kleo/hierarchicalkeylistjob.h -+ kleo/keyfilter.h -+ kleo/keyfiltermanager.h -+ kleo/changepasswdjob.h -+ kleo/checksumdefinition.h -+ kleo/exception.h -+ kleo/kconfigbasedkeyfilter.h -+ kleo/listallkeysjob.h -+ kleo/stl_util.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel) -+ -+install ( FILES -+ ui/kdhorizontalline.h -+ ui/messagebox.h -+ ui/progressbar.h -+ ui/progressdialog.h -+ ui/keylistview.h -+ ui/keyselectiondialog.h -+ ui/keyrequester.h -+ ui/keyapprovaldialog.h -+ ui/dnattributeorderconfigwidget.h -+ ui/cryptoconfigmodule.h -+ ui/cryptoconfigdialog.h -+ ui/directoryserviceswidget.h -+ ui/filenamerequester.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel) -diff -up kdepim-4.11.90/libkpgp/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/libkpgp/CMakeLists.txt ---- kdepim-4.11.90/libkpgp/CMakeLists.txt.install_kleopatra_headers 2013-11-16 13:17:30.290810557 -0600 -+++ kdepim-4.11.90/libkpgp/CMakeLists.txt 2013-11-16 13:20:55.258111864 -0600 -@@ -35,3 +35,11 @@ add_subdirectory( tests ) - install(FILES kconf_update/kpgp.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) - install(PROGRAMS kconf_update/kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) - -+install(FILES -+ kpgp.h -+ kpgpbase.h -+ kpgpblock.h -+ kpgpkey.h -+ kpgpui.h -+ libkpgp_export.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel ) diff --git a/kdepim-4.14.10-autostart.patch b/kdepim-4.14.10-autostart.patch deleted file mode 100644 index ee38203..0000000 --- a/kdepim-4.14.10-autostart.patch +++ /dev/null @@ -1,22 +0,0 @@ -dff -up kdepim-4.14.10/kalarm/kalarm.autostart.desktop.autostart kdepim-4.14.10/kalarm/kalarm.autostart.desktop ---- kdepim-4.14.10/kalarm/kalarm.autostart.desktop.autostart 2015-06-25 12:47:38.000000000 -0500 -+++ kdepim-4.14.10/kalarm/kalarm.autostart.desktop 2015-11-06 09:56:23.015693504 -0600 -@@ -127,4 +127,5 @@ Comment[zh_CN]=登录时自动启动 KAl - Comment[zh_TW]=KAlarm 登入時自動啟動 - Terminal=false - X-KDE-autostart-phase=2 --X-KDE-autostart-condition=kalarmrc:General:AutoStart:false -+X-KDE-autostart-condition[$e]=$(kde4-config --path config --locate kalarmrc):General:AutoStart:false -+OnlyShowIn=KDE; -diff -up kdepim-4.14.10/korgac/korgac.desktop.autostart kdepim-4.14.10/korgac/korgac.desktop ---- kdepim-4.14.10/korgac/korgac.desktop.autostart 2015-06-25 12:47:38.000000000 -0500 -+++ kdepim-4.14.10/korgac/korgac.desktop 2015-11-06 10:14:51.256941851 -0600 -@@ -123,7 +123,7 @@ GenericName[zh_TW]=KOrganizr 提醒守� - Terminal=false - - X-KDE-autostart-phase=2 --X-KDE-autostart-condition=korgacrc:General:Autostart:true -+X-KDE-autostart-condition[$e]=$(kde4-config --path config --locate korgacrc):General:Autostart:true - X-DBUS-StartupType=Unique - - #do not uncomment the following line, else autostart fails diff --git a/kdepim.spec b/kdepim.spec index 272db7a..341adf6 100644 --- a/kdepim.spec +++ b/kdepim.spec @@ -8,14 +8,14 @@ %define blogilo 1 %endif -Name: kdepim -Summary: KDE PIM (Personal Information Manager) applications -Epoch: %{kdepim_epoch} -Version: 4.14.10 -Release: 8%{?dist} - -License: GPLv2 -URL: https://projects.kde.org/projects/kde/kdepim +Name: kdepim +Summary: KDE PIM (Personal Information Manager) applications +Epoch: %{kdepim_epoch} +Version: 15.11.90 +Release: 1%{?dist} + +License: GPLv2 +URL: http://www.kde.org/ %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable @@ -24,302 +24,303 @@ URL: https://projects.kde.org/projects/kde/kdepim %endif Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz -# revert http://websvn.kde.org/?view=revision&revision=1072331 (rebased to 4.6) -# for kopete-cryptography (mostly) -Patch0: kdepim-4.11.90-install_kleopatra_headers.patch -Patch1: kdepim-4.14.10-autostart.patch +Patch0: kdepim-kleopatra-conf-link-against-i18n.patch ## upstream patches -Provides: kdepim4 = %{version}-%{release} - # Make the kdepim package a metapackage for the entire PIM experience # (except for akonadi-console) -Requires: akregator = %{version}-%{release} +Requires: akregator = %{version}-%{release} %if 0%{?blogilo} -Requires: blogilo = %{version}-%{release} +Requires: blogilo = %{version}-%{release} %endif -Requires: kalarm = %{version}-%{release} -Requires: kjots = %{version}-%{release} -Requires: knode = %{version}-%{release} -Requires: knotes = %{version}-%{release} -Requires: ktimetracker = %{version}-%{release} -Requires: kontact = %{version}-%{release} - -BuildRequires: baloo-devel >= 4.14 -BuildRequires: bison flex -BuildRequires: boost-devel -BuildRequires: chrpath -BuildRequires: cyrus-sasl-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: gpgme-devel -BuildRequires: grantlee-devel >= 0.5.0 -BuildRequires: kactivities-devel -BuildRequires: kdelibs4-devel >= 4.14 -BuildRequires: kdelibs4-webkit-devel -BuildRequires: kdepimlibs-devel >= 4.14.7 -BuildRequires: kde-baseapps-devel >= 4.14 -BuildRequires: libassuan-devel +Requires: kalarm = %{version}-%{release} +Requires: knotes = %{version}-%{release} +Requires: kontact = %{version}-%{release} + +BuildRequires: bison flex +BuildRequires: boost-devel +BuildRequires: chrpath +BuildRequires: cyrus-sasl-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gpgme-devel + +BuildRequires: libX11-devel + +BuildRequires: grantlee-qt5-devel +#BuildRequires: kactivities-devel + +BuildRequires: kf5-rpm-macros +BuildRequires: extra-cmake-modules +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-static +BuildRequires: qt5-qtx11extras-devel +BuildRequires: qt5-qtwebkit-devel +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt5-qtquick1-devel + +BuildRequires: kf5-kdelibs4support-devel +BuildRequires: kf5-kwallet-devel +BuildRequires: kf5-knewstuff-devel +BuildRequires: kf5-kcmutils-devel +BuildRequires: kf5-kdewebkit-devel +BuildRequires: kf5-karchive-devel +BuildRequires: kf5-knotifyconfig-devel +BuildRequires: kf5-kconfig-devel +BuildRequires: kf5-khtml-devel +BuildRequires: kf5-kservice-devel +BuildRequires: kf5-kdbusaddons-devel +BuildRequires: kf5-kauth-devel +BuildRequires: kf5-kdoctools-devel +BuildRequires: kf5-kdnssd-devel +BuildRequires: kf5-ktexteditor-devel +BuildRequires: kf5-sonnet-devel +BuildRequires: kf5-kglobalaccel-devel +BuildRequires: kf5-kcodecs-devel +BuildRequires: phonon-qt5-devel +BuildRequires: kf5-kxmlrpcclient-devel +BuildRequires: kf5-kross-devel + +BuildRequires: kf5-kpimtextedit-devel +BuildRequires: kf5-akonadi-devel +BuildRequires: kf5-akonadi-contact-devel +BuildRequires: kf5-kcontacts-devel +BuildRequires: kf5-kidentitymanagement-devel +BuildRequires: kf5-kldap-devel +BuildRequires: kf5-kmailtransport-devel +BuildRequires: kf5-akonadi-mime-devel +BuildRequires: kf5-kcalendarutils-devel +BuildRequires: kf5-kholidays-devel +BuildRequires: kf5-ktnef-devel +BuildRequires: kf5-kimap-devel +BuildRequires: kf5-kmbox-devel + +BuildRequires: kf5-akonadi-calendar-devel +BuildRequires: kf5-syndication-devel +BuildRequires: kf5-gpgmepp-devel +BuildRequires: kf5-kontactinterface-devel +BuildRequires: kf5-kalarmcal-devel +BuildRequires: kf5-kmime-devel +BuildRequires: kf5-kblog-devel +BuildRequires: kf5-akonadi-notes-devel + +BuildRequires: kf5-akonadi-server-devel +BuildRequires: kf5-akonadi-search-devel + %if 0%{?blogilo} -BuildRequires: libkgapi-devel >= 2.1.95 +BuildRequires: libkgapi-devel >= 5.0.0 %endif -BuildRequires: pkgconfig(akonadi) >= 1.12.90 -BuildRequires: pkgconfig(libical) -BuildRequires: pkgconfig(libxslt) -BuildRequires: pkgconfig(qca2) -BuildRequires: pkgconfig(QJson) -BuildRequires: pkgconfig(xpm) pkgconfig(xscrnsaver) -%if 0%{?fedora} -BuildRequires: prison-devel -%endif -BuildRequires: python-devel -BuildRequires: sed -BuildRequires: zlib-devel + +BuildRequires: pkgconfig(libical) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(qca2) +BuildRequires: pkgconfig(QJson) +BuildRequires: pkgconfig(xpm) pkgconfig(xscrnsaver) +BuildRequires: python-devel +BuildRequires: zlib-devel + %description %{summary}, including: * akregator: feed aggregator %{?blogilo:* blogilo: blogging application, focused on simplicity and usability} * kmail: email client -* knode: newsreader * knotes: sticky notes for the desktop * kontact: integrated PIM management * korganizer: journal, appointments, events, todos -%package libs -Summary: %{name} runtime libraries -%description libs +%package libs +Summary: %{name} runtime libraries +%description libs -%package devel -Summary: %{name} development files -Provides: libkleopatra-devel = %{version}-%{release} -Provides: libkleopatra-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -%description devel -%{summary}. +#%package devel +#Summary: %{name} development files +#Provides: libkleopatra-devel = %{version}-%{release} +#Provides: libkleopatra-devel%{?_isa} = %{version}-%{release} +#Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +#%description devel +#%{summary}. -%package common -Summary: Common runtime dependencies needed by other KDE PIM applications +%package common +Summary: Common runtime dependencies needed by other KDE PIM applications # change epoch here and below for new subpkgs introduced in 4.13.3-10 -Epoch: 0 -Conflicts: kdepim < 7:4.13.3-10 -Requires: %{name}-libs%{?_isa} = %{kdepim_epoch}:%{version}-%{release} -Requires: kdepim4-runtime >= %{version} -%description common +Epoch: 0 +Conflicts: kdepim < 7:4.13.3-10 +Requires: %{name}-libs%{?_isa} = %{kdepim_epoch}:%{version}-%{release} +Requires: kdepim4-runtime >= %{version} +%description common %{summary}. -%package -n akonadiconsole -Summary: Akonadi developer tool -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} +%package -n akonadiconsole +Summary: Akonadi developer tool +Epoch: 0 +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} %description -n akonadiconsole Akonadi Console is a tool for Akonadi developers that provides means of direct interaction with the Akonadi storage, SQL debugging, protocol debugger and other tools. -%package -n akregator -Summary: KDE new feed reader -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: akregator-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%package -n akregator +Summary: KDE new feed reader +Epoch: 0 +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: akregator-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %{?kde_runtime_requires} %description -n akregator Akregator is a KDE news feed reader. Feed readers provide a convenient way to browse different kinds of content, including news, blogs, and other content from online sites. -%package -n akregator-libs -Summary: Runtime libraries for Akregator -Epoch: 0 +%package -n akregator-libs +Summary: Runtime libraries for Akregator +Epoch: 0 %description -n akregator-libs %{summary}. -%package -n blogilo -Summary: KDE blogging client -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} +%package -n blogilo +Summary: KDE blogging client +Epoch: 0 +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} %{?kde_runtime_requires} %description -n blogilo Blogilo is blogging client that supports various blogging systems, including Wordpress, Blogspot, LiveJournal, and more. -%package -n kaddressbook -Summary: KDE Adress Book application -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: kaddressbook-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%package -n kaddressbook +Summary: KDE Adress Book application +Epoch: 0 +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: kaddressbook-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %{?kde_runtime_requires} -Requires: baloo-akonadi %description -n kaddressbook KAddressBook is an application to access and manage contacts and addressbooks. -%package -n kaddressbook-libs -Summary: Runtime libraries for KAddressBook -Epoch: 0 +%package -n kaddressbook-libs +Summary: Runtime libraries for KAddressBook +Epoch: 0 %description -n kaddressbook-libs %{summary}. -%package -n kalarm -Summary: Personal alarm message, command and email scheduler for KDE -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} +%package -n kalarm +Summary: Personal alarm message, command and email scheduler for KDE +Epoch: 0 +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} %{?kde_runtime_requires} %description -n kalarm %{summary}. -%package -n kjots -Summary: KDE Notes application -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -%{?kde_runtime_requires} -Requires: baloo-akonadi -%description -n kjots -KJots is an application for writing and organizing notes. - -%package -n kleopatra -Summary: KDE certificate manager and unified crypto GUI -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: kleopatra-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%package -n kleopatra +Summary: KDE certificate manager and unified crypto GUI +Epoch: 0 +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: kleopatra-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %{?kde_runtime_requires} -Requires: dirmngr -Requires: gnupg2-smime +Requires: dirmngr +Requires: gnupg2-smime %description -n kleopatra %{summary}. -%package -n kleopatra-libs -Summary: Runtime libraries for Kleopatra -Epoch: 0 +%package -n kleopatra-libs +Summary: Runtime libraries for Kleopatra +Epoch: 0 %description -n kleopatra-libs %{summary}. -%package -n kmail -Summary: KDE email client -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: kmail-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: kate4-part +%package -n kmail +Summary: KDE email client +Epoch: 0 +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: kmail-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +#Requires: kate-part # For GPG management -Requires: kleopatra = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: kleopatra = %{?epoch:%{epoch}:}%{version}-%{release} # kmail searches for gpg instead of gpg2, breaking email encryption # http://bugzilla.redhat.com/630249 # TODO: patch to use gpg2 (unconditionally or as in addition to gpg) -Requires: gnupg -Requires: baloo-akonadi +Requires: gnupg +Requires: kf5-akonadi-search %if 0%{?fedora} || 0%{?rhel} > 6 ##Optional bits -#Requires: bogofilter -Requires: pinentry-gui -#Requires: spamassassin +#Requires: bogofilter +Requires: pinentry-gui +#Requires: spamassassin %endif %description -n kmail KMail is a full-featured email client for KDE. -%package -n kmail-libs -Summary: Runtime libraries for KMail -Epoch: 0 +%package -n kmail-libs +Summary: Runtime libraries for KMail +Epoch: 0 %description -n kmail-libs %{summary}. -%package -n knode -Summary: A newsreader application for KDE -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: knode-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%package -n knotes +Summary: KDE application for popup notes +Epoch: 0 +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: knotes-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %{?kde_runtime_requires} -%description -n knode -%{summary}. - -%package -n knode-libs -Summary: Runtime libraries for KNode -Epoch: 0 -%description -n knode-libs -%{summary}. - -%package -n knotes -Summary: KDE application for popup notes -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: knotes-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -%{?kde_runtime_requires} -Requires: baloo-akonadi %description -n knotes %{summary}. -%package -n knotes-libs -Summary: Runtime libraries for KNotes -Epoch: 0 +%package -n knotes-libs +Summary: Runtime libraries for KNotes +Epoch: 0 %description -n knotes-libs %{summary}. -%package -n kontact -Summary: KDE Personal Information Management Suite -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: kontact-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -# These are only base applications withou -Requires: kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: kmail = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: korganizer = %{?epoch:%{epoch}:}%{version}-%{release} +%package -n kontact +Summary: KDE Personal Information Management Suite +Epoch: 0 +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: kontact-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +# These are only base applications without which Kontact does not really make sense +Requires: kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: kmail = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: korganizer = %{?epoch:%{epoch}:}%{version}-%{release} %description -n kontact %{summary}. -%package -n kontact-libs -Summary: Runtime libraries for Kontact -Epoch: 0 +%package -n kontact-libs +Summary: Runtime libraries for Kontact +Epoch: 0 %description -n kontact-libs %{summary}. -%package -n korganizer -Summary: KDE calendaring application -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: korganizer-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%package -n korganizer +Summary: KDE calendaring application +Epoch: 0 +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: korganizer-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %{?kde_runtime_requires} -Requires: baloo-akonadi %description -n korganizer %{summary}. -%package -n korganizer-libs -Summary: Runtime libraries for KOrganizer -Epoch: 0 +%package -n korganizer-libs +Summary: Runtime libraries for KOrganizer +Epoch: 0 %description -n korganizer-libs %{summary}. -%package -n ktimetracker -Summary: A KDE application for time and task management -Epoch: 0 -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -%{?kde_runtime_requires} -%description -n ktimetracker -%{summary}. - - %prep %setup -q -n kdepim-%{version}%{?pre} -%patch0 -p1 -b .install_kleopatra_headers -%patch1 -p1 -b .autostart +%patch0 -p1 -b .kleopatra-conf-link-against-i18n # Ensure app .desktop files have Comment= fields to make appstream happier -grep '^Comment=' kmail/data/KMail2.desktop || echo "Comment=Send, receive and manage your mail with KMail" >> kmail/data/KMail2.desktop -grep '^Comment=' knode/KNode.desktop || echo "Comment=Usenet news (nntp) client" >> knode/KNode.desktop -grep '^Comment=' kontact/src/Kontact.desktop || echo "Comment=Kontact is the integrated solution to your personal information management (PIM) needs." >> kontact/src/Kontact.desktop - -# purge use of /usr/bin/env -sed -i.env \ - -e "s|^#! /usr/bin/env bash$|#!/bin/bash|g" \ - kmail/kconf_update/*.sh +grep '^Comment=' kmail/data/org.kde.kmail.desktop || echo "Comment=Send, receive and manage your mail with KMail" >> kmail/data/org.kde.kmail.desktop +grep '^Comment=' kontact/src/org.kde.kontact.desktop || echo "Comment=Kontact is the integrated solution to your personal information management (PIM) needs." >> kontact/src/org.kde.kontact.desktop %build -mkdir %{_target_platform} +mkdir -p %{_target_platform} pushd %{_target_platform} # We disable kdepim-mobile because it doesn't actually work yet. (#717694) # Plus, it should probably go to a subpackage once it actually does work. -%{cmake_kde4} .. \ - -DKDEPIM_BUILD_MOBILE:BOOL=OFF +%{cmake_kf5} \ + -DKDEPIM_BUILD_MOBILE:BOOL=OFF \ + .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -328,64 +329,56 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -for module in \ - akonadi_archivemail_agent akonadi_followupreminder_agent \ - akonadi_notes_agent akonadi_sendlater_agent \ - akregator %{?blogilo:blogilo} contactthemeeditor headerthemeeditor importwizard \ - kabcclient kalarm kioslave kjots kleopatra kmail kmailcvt knode knotes \ - konsolekalendar kontact kontact-admin korganizer ktimetracker ktnef \ - kwatchgnupg pimsettingexporter sieveeditor \ -; do -%find_lang $module --with-kde --without-mo -done - -# for pkgs that contain > 1 of the agove, combine some -cat kontact.lang kontact-admin.lang > kontact-all.lang -cat kmail.lang ktnef.lang headerthemeeditor.lang kmailcvt.lang sieveeditor.lang \ - akonadi_archivemail_agent.lang akonadi_followupreminder_agent.lang \ - akonadi_notes_agent.lang akonadi_sendlater_agent.lang \ - kioslave.lang > kmail-all.lang -cat kleopatra.lang kwatchgnupg.lang > kleopatra-all.lang -cat kabcclient.lang konsolekalendar.lang > akonadiconsole.lang -cat importwizard.lang pimsettingexporter.lang > common.lang +# Remove .so files, we don't have any headers for -devel anyway +rm -fv %{buildroot}%{_kf5_libdir}/lib*.so + +#for module in \ +# il_agent akonadi_followupreminder_agent \ +# akonadi_notes_agent akonadi_sendlater_agent \ +# akregator %{?blogilo:blogilo} contactthemeeditor headerthemeeditor importwizard \ +# kabcclient kalarm kioslave kleopatra kmail kmailcvt knotes \ +# konsolekalendar kontact kontact-admin korganizer ktimetracker ktnef \ +# kwatchgnupg pimsettingexporter sieveeditor \ +#; do +#%find_lang $module --with-kde --without-mo +#done + +# for pkgs that contain > 1 of the above, combine some +#cat kontact.lang kontact-admin.lang > kontact-all.lang +#cat kmail.lang ktnef.lang headerthemeeditor.lang kmailcvt.lang sieveeditor.lang \ +# akonadi_archivemail_agent.lang akonadi_followupreminder_agent.lang \ +# akonadi_notes_agent.lang akonadi_sendlater_agent.lang \ +# kioslave.lang > kmail-all.lang +#cat kleopatra.lang kwatchgnupg.lang > kleopatra-all.lang +#cat kabcclient.lang konsolekalendar.lang > akonadiconsole.lang +#cat importwizard.lang pimsettingexporter.lang > common.lang # not sure where this is coming from... -- Rex -chrpath --list %{buildroot}%{_kde4_bindir}/kabc2mutt && \ -chrpath --delete %{buildroot}%{_kde4_bindir}/kabc2mutt - -# drop use of /usr/share/autostart -mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart -mv %{buildroot}%{_kde4_datadir}/autostart/kalarm.autostart.desktop \ - %{buildroot}%{_kde4_datadir}/autostart/korgac.desktop \ - %{buildroot}%{_sysconfdir}/xdg/autostart/ - -# create/own korgacrc -# create/own kgpgrc -mkdir -p %{buildroot}%{_kde4_configdir} -touch %{buildroot}%{_kde4_configdir}/korgacrc +chrpath --list %{buildroot}%{_kf5_bindir}/kabc2mutt && \ +chrpath --delete %{buildroot}%{_kf5_bindir}/kabc2mutt %check -for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do +for f in %{buildroot}%{_kf5_datadir}/applications/*.desktop ; do desktop-file-validate $f done %post -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: -touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: +touch --no-create %{_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_iconsdir}/oxygen &> /dev/null ||: %posttrans -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: +gtk-update-icon-cache %{_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_iconsdir}/oxygen &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun if [ $1 -eq 0 ] ; then - touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: - gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: - gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: + touch --no-create %{_iconsdir}/hicolor &> /dev/null ||: + touch --no-create %{_iconsdir}/oxygen &> /dev/null ||: + gtk-update-icon-cache %{_iconsdir}/hicolor &> /dev/null ||: + gtk-update-icon-cache %{_iconsdir}/oxygen &> /dev/null ||: update-desktop-database -q &> /dev/null ||: fi @@ -394,12 +387,12 @@ fi # empty metapackage %post common -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: -touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: +touch --no-create %{_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{__iconsdir}/oxygen &> /dev/null ||: %posttrans common -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: +gtk-update-icon-cache %{_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_iconsdir}/oxygen &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun common @@ -407,107 +400,109 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files common -f common.lang +%files common +#-f common.lang %doc README COPYING COPYING.DOC COPYING.LIB # own some kontact-related dirs here -%dir %{_kde4_appsdir}/kontact/ -%dir %{_kde4_appsdir}/kontact/ksettingsdialog/ -%dir %{_kde4_datadir}/kde4/services/kontact/ +%dir %{_kf5_datadir}/kontact/ +%dir %{_kf5_datadir}/kontact/ksettingsdialog/ +%dir %{_kf5_datadir}/kservices5/kontact # calendarsupport -%{_kde4_datadir}/kde4/servicetypes/calendarplugin.desktop +%{_kf5_datadir}/kservicetypes5/calendarplugin.desktop # calendarviews -%{_kde4_datadir}/kde4/servicetypes/calendardecoration.desktop +%{_kf5_datadir}/kservicetypes5/calendardecoration.desktop # composereditor-ng -%{_kde4_appsdir}/composereditor/ -# grantleetheme -%{_kde4_appsdir}/kconf_update/grantleetheme.upd +%{_kf5_datadir}/composereditor/ # importwizard - can import mails, addressbooks and calendars, hence -common -%{_kde4_bindir}/importwizard -%{_kde4_datadir}/applications/kde4/importwizard.desktop -%{_kde4_datadir}/icons/hicolor/*/apps/kontact-import-wizard.* -# incidenceeditor-ng -%{_kde4_bindir}/kincidenceeditor -# kresources -%{_kde4_libdir}/kde4/kcal_*.so -%{_kde4_datadir}/kde4/services/kresources/kcal/*.desktop +%{_kf5_bindir}/importwizard +%{_kf5_bindir}/accountwizard +%{_kf5_bindir}/contactprintthemeeditor +%{_kf5_bindir}/ispdb +%{_kf5_datadir}/applications/org.kde.importwizard.desktop +%{_kf5_datadir}/icons/hicolor/*/apps/kontact-import-wizard.* +%{_kf5_datadir}/icons/hicolor/*/apps/quickview.* +%{_kf5_datadir}/kconf_update/importwizard-15.08-kickoff.sh +%{_kf5_datadir}/kconf_update/importwizard.upd +%{_kf5_datadir}/importwizard/pics/ +%{_kf5_datadir}/doc/HTML/en/importwizard +%{_kf5_datadir}/akonadi/accountwizard/tine20/ +%{_kf5_datadir}/mime/packages/accountwizard-mime.xml +%{_kf5_datadir}/applications/org.kde.accountwizard.desktop +%{_kf5_datadir}/applications/org.kde.contactprintthemeeditor.desktop +%{_kf5_qtplugindir}/accountwizard_plugin.so # libkdepim -%{_kde4_libdir}/kde4/plugins/designer/kdepimwidgets.so -%{_kde4_appsdir}/kdepimwidgets/ -# libkpgp -%{_kde4_appsdir}/kconf_update/kpgp* -%dir %{_kde4_appsdir}/knode/ -%dir %{_kde4_appsdir}/knode/pics -%{_kde4_appsdir}/knode/pics/key* -%dir %{_kde4_appsdir}/kmail2/ -%dir %{_kde4_appsdir}/kmail2/pics/ -%{_kde4_appsdir}/kmail2/pics/key* +%{_kf5_qtplugindir}/designer/kdepimwidgets.so +%{_kf5_datadir}/kdepimwidgets/ +%{_sysconfdir}/xdg/kdepim.categories +%{_sysconfdir}/xdg/accountwizard.knsrc +%dir %{_kf5_datadir}/kmail2/ +%dir %{_kf5_datadir}/kmail2/pics/ # pimcommon -%{_kde4_libdir}/kde4/plugins/designer/pimcommonwidgets.so -%{_kde4_datadir}/icons/hicolor/*/apps/kdepim-dropbox.png -%{_kde4_datadir}/icons/hicolor/*/apps/kdepim-googledrive.png +%{_kf5_qtplugindir}/designer/pimcommonwidgets.so +%{_kf5_qtplugindir}/pimcommon/pimcommon_*.so # pimsettingexporter -%{_kde4_bindir}/pimsettingexporter -%{_kde4_appsdir}/pimsettingexporter/ -%{_kde4_datadir}/applications/kde4/pimsettingexporter.desktop +%{_kf5_bindir}/pimsettingexporter +%{_kf5_bindir}/pimsettingexporterconsole +%{_kf5_datadir}/kconf_update/pimsettingexporter-15.08-kickoff.sh +%{_kf5_datadir}/kconf_update/pimsettingexporter.upd +%{_kf5_datadir}/applications/org.kde.pimsettingexporter.desktop +%{_kf5_datadir}/doc/HTML/en/pimsettingexporter/ # plugins -%{_kde4_libdir}/kde4/ktexteditorkabcbridge.so -%{_kde4_libdir}/akonadi/contact/editorpageplugins/cryptopageplugin.so +%{_kf5_libdir}/akonadi/contact/editorpageplugins/cryptopageplugin.so # storageservicemanager - this is currently used by kmail only, but plans are # to support other components too -%{_kde4_bindir}/storageservicemanager -%{_kde4_appsdir}/storageservicemanager/ -%{_kde4_datadir}/applications/kde4/storageservicemanager.desktop +%{_kf5_bindir}/storageservicemanager +%{_kf5_datadir}/kconf_update/storageservicemanager-15.08-kickoff.sh +%{_kf5_datadir}/kconf_update/storageservicemanager.upd +%{_kf5_datadir}/applications/org.kde.storageservicemanager.desktop +%{_kf5_datadir}/knotifications5/storageservicemanager.notifyrc # templateparser -%{_kde4_datadir}/config.kcfg/customtemplates_kfg.kcfg -%{_kde4_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg +%{_kf5_datadir}/config.kcfg/customtemplates_kfg.kcfg +%{_kf5_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files libs -# akonadi_next -%{_kde4_libdir}/libakonadi_next.so.* +%{_kf5_libdir}/grantlee/5.0/kde_grantlee_plugin.so +# gravatar +%{_kf5_libdir}/libKF5Gravatar.so.* # libcalendarsupport -%{_kde4_libdir}/libcalendarsupport.so.* -%{_kde4_libdir}/libcalendarsupportcollectionpage.so.* +%{_kf5_libdir}/libKF5CalendarSupport.so.* # calendarviews -%{_kde4_libdir}/libeventviews.so.* +%{_kf5_libdir}/libKF5EventViews.* # composereditorng -%{_kde4_libdir}/libcomposereditorng.so.* -# grantlee -%{_kde4_libdir}/libgrantleethemeeditor.so.* +%{_kf5_libdir}/libKF5ComposerEditorNG.so.* +# # grantlee +%{_kf5_libdir}/libgrantleethemeeditor.so.* # grantleetheme -%{_kde4_libdir}/libgrantleetheme.so.* -# incidenceeditor-ng -%{_kde4_libdir}/libincidenceeditorsng.so.* +%{_kf5_libdir}/libKF5GrantleeTheme.so.* +# # incidenceeditor-ng +%{_kf5_libdir}/libKF5IncidenceEditorsng.* # FIXME: We are building -DKDEPIM_BUILD_MOBILE=OFF, this should not exist -%{_kde4_libdir}/libincidenceeditorsngmobile.so.* -# kresources -%{_kde4_libdir}/libkcal_*.so.* +# %{_kf5_libdir}/libincidenceeditorsngmobile.so.* # libkdepim -%{_kde4_libdir}/libkdepim.so.* +%{_kf5_libdir}/libKF5Libkdepim.so.* # libkdepimdbusinterfaces -%{_kde4_libdir}/libkdepimdbusinterfaces.so.* -# libkpgp -%{_kde4_libdir}/libkpgp.so.* +%{_kf5_libdir}/libKF5KdepimDBusInterfaces.so.* # pimcommon -%{_kde4_libdir}/libpimcommon.so.* +%{_kf5_libdir}/libKF5PimCommon.so.* # pimsettingexporter (in -common) -%{_kde4_libdir}/libpimsettingexporterprivate.so.* +%{_kf5_libdir}/libpimsettingexporterprivate.so.* # templateparser -%{_kde4_libdir}/libtemplateparser.so.* +%{_kf5_libdir}/libKF5TemplateParser.so.* # kdgantt2 -%{_kde4_libdir}/libkdgantt2.so.* +%{_kf5_libdir}/libKF5KDGantt2.so.* -%files devel -%{_kde4_includedir}/* -%{_kde4_libdir}/lib*.so +#%files devel +#%{_kf5_includedir}/* +#%{_kf5_libdir}/lib*.so %post -n akonadiconsole -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null ||: %posttrans -n akonadiconsole -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun -n akonadiconsole @@ -515,27 +510,26 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files -n akonadiconsole -f akonadiconsole.lang -%{_kde4_bindir}/akonadiconsole -%{_kde4_appsdir}/akonadiconsole -%{_kde4_datadir}/applications/kde4/akonadiconsole.desktop -%{_kde4_datadir}/icons/hicolor/*/apps/akonadiconsole.* +%files -n akonadiconsole +# -f akonadiconsole.lang +%{_kf5_bindir}/akonadiconsole +%{_kf5_datadir}/kconf_update/akonadiconsole.upd +%{_kf5_datadir}/applications/org.kde.akonadiconsole.desktop +%{_kf5_datadir}/icons/hicolor/*/apps/akonadiconsole.* +%{_kf5_datadir}/kconf_update/akonadiconsole-15.08-kickoff.sh # This is not from akonadiconsole, but from console - not sure if there's any # use of this stuff outside dev environment -%{_kde4_bindir}/calendarjanitor -%{_kde4_bindir}/konsolekalendar -%{_kde4_datadir}/applications/kde4/konsolekalendar.desktop -%{_kde4_datadir}/icons/hicolor/*/apps/konsolekalendar.* -%{_kde4_bindir}/kabcclient -%{_kde4_bindir}/kabc2mutt -# doc -%{_mandir}/man1/kabcclient.1.gz +%{_kf5_bindir}/calendarjanitor +%{_kf5_bindir}/konsolekalendar +%{_kf5_datadir}/applications/konsolekalendar.desktop +%{_kf5_datadir}/icons/hicolor/*/apps/konsolekalendar.* +%{_kf5_datadir}/doc/HTML/en/konsolecalendar/ %post -n akregator -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null ||: %posttrans -n akregator -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun -n akregator @@ -543,39 +537,45 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files -n akregator -f akregator.lang -%{_kde4_bindir}/akregatorstorageexporter -%{_kde4_bindir}/akregator -%{_kde4_libdir}/kde4/akregatorpart.so -%{_kde4_libdir}/kde4/akregator_*.so -%{_kde4_datadir}/kde4/services/akregator_*.desktop -%{_kde4_datadir}/kde4/services/feed.protocol -%{_kde4_datadir}/kde4/servicetypes/akregator_plugin.desktop -%{_kde4_datadir}/config.kcfg/akregator.kcfg -%{_kde4_datadir}/applications/kde4/akregator.desktop -%{_kde4_datadir}/icons/hicolor/*/apps/akregator.* -%{_kde4_datadir}/icons/hicolor/*/apps/akregator_empty.png -%{_kde4_appsdir}/akregator -%{_kde4_appsdir}/akregator_sharemicroblog_plugin +%files -n akregator +# -f akregator.lang +%{_kf5_bindir}/akregatorstorageexporter +%{_kf5_bindir}/akregator +%{_kf5_qtplugindir}/akregatorpart.so +%{_kf5_qtplugindir}/akregator_*.so +%{_kf5_datadir}/kservices5/akregator_*.desktop +%{_kf5_datadir}/kservices5/feed.protocol +%{_kf5_datadir}/kservicetypes5/akregator_plugin.desktop +%{_kf5_datadir}/config.kcfg/akregator.kcfg +%{_kf5_datadir}/applications/org.kde.akregator.desktop +%{_kf5_datadir}/icons/hicolor/*/apps/akregator.* +%{_kf5_datadir}/icons/hicolor/*/apps/akregator_empty.png +%{_kf5_datadir}/akregator +%{_kf5_datadir}/kconf_update/akregator-15.08-kickoff.sh +%{_kf5_datadir}/kconf_update/akregator.upd %{_datadir}/dbus-1/interfaces/org.kde.akregator.part.xml # Kontact integration -%{_kde4_libdir}/kde4/kontact_akregatorplugin.so -%{_kde4_datadir}/kde4/services/kontact/akregatorplugin.desktop -%{_kde4_appsdir}/kontact/ksettingsdialog/akregator.setdlg +%{_kf5_qtplugindir}/kontact_akregatorplugin.so +%{_kf5_datadir}/kservices5/kontact/akregatorplugin.desktop +%{_kf5_datadir}/kontact/ksettingsdialog/akregator.setdlg +%{_kf5_datadir}/appdata/akregator.appdata.xml +%{_kf5_datadir}/doc/HTML/en/akregator/ +%{_kf5_datadir}/knotifications5/akregator.notifyrc +%{_kf5_datadir}/kxmlgui5/akregator/ %post -n akregator-libs -p /sbin/ldconfig %postun -n akregator-libs -p /sbin/ldconfig %files -n akregator-libs -%{_kde4_libdir}/libakregatorinterfaces.so.* -%{_kde4_libdir}/libakregatorprivate.so.* +%{_kf5_libdir}/libakregatorinterfaces.so.* +%{_kf5_libdir}/libakregatorprivate.so.* %if 0%{?blogilo} %post -n blogilo -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_kf5_datadir}/hicolor &> /dev/null ||: %posttrans -n blogilo -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/hicolor &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun -n blogilo @@ -583,24 +583,28 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files -n blogilo -f blogilo.lang -%{_kde4_bindir}/blogilo -%{_kde4_datadir}/applications/kde4/blogilo.desktop -%{_kde4_datadir}/config.kcfg/blogilo.kcfg -%{_kde4_appsdir}/blogilo -%{_kde4_datadir}/icons/hicolor/*/apps/blogilo.png -%{_kde4_datadir}/icons/hicolor/*/actions/upload-media.png -%{_kde4_datadir}/icons/hicolor/*/actions/format-text-blockquote.png -%{_kde4_datadir}/icons/hicolor/*/actions/format-text-code.png -%{_kde4_datadir}/icons/hicolor/*/actions/insert-more-mark.png -%{_kde4_datadir}/icons/hicolor/*/actions/remove-link.png +%files -n blogilo +# -f blogilo.lang +%{_kf5_bindir}/blogilo +%{_kf5_datadir}/applications/org.kde.blogilo.desktop +%{_kf5_datadir}/config.kcfg/blogilo.kcfg +%{_kf5_datadir}/kconf_update/blogilo-15.08-kickoff.sh +%{_kf5_datadir}/kconf_update/blogilo.upd +%{_kf5_datadir}/icons/hicolor/*/apps/blogilo.png +%{_kf5_datadir}/icons/hicolor/*/actions/upload-media.png +%{_kf5_datadir}/icons/hicolor/*/actions/format-text-blockquote.png +%{_kf5_datadir}/icons/hicolor/*/actions/format-text-code.png +%{_kf5_datadir}/icons/hicolor/*/actions/insert-more-mark.png +%{_kf5_datadir}/icons/hicolor/*/actions/remove-link.png +%{_kf5_datadir}/appdata/blogilo.appdata.xml +%{_kf5_datadir}/doc/HTML/en/blogilo/ %endif %post -n kaddressbook -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_kf5_datadir}/hicolor &> /dev/null ||: %posttrans -n kaddressbook -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/hicolor &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun -n kaddressbook @@ -608,41 +612,46 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files -n kaddressbook -f contactthemeeditor.lang -%{_kde4_bindir}/kaddressbook -%{_kde4_libdir}/kde4/kaddressbookpart.so -%{_kde4_datadir}/kde4/services/kaddressbookpart.desktop -%{_kde4_datadir}/applications/kde4/kaddressbook.desktop -%{_kde4_datadir}/applications/kde4/kaddressbook-importer.desktop -%{_kde4_datadir}/config/kaddressbook_themes.knsrc -%{_kde4_datadir}/icons/hicolor/*/apps/kaddressbook.* -%{_kde4_appsdir}/kaddressbook +%files -n kaddressbook +# -f contactthemeeditor.lang +%{_kf5_bindir}/kaddressbook +%{_kf5_qtplugindir}/kaddressbookpart.so +%{_kf5_datadir}/kservices5/kaddressbookpart.desktop +%{_kf5_datadir}/applications/org.kde.kaddressbook.desktop +%{_kf5_datadir}/applications/kaddressbook-importer.desktop +%{_kf5_datadir}/icons/hicolor/*/apps/kaddressbook.* +%{_kf5_datadir}/kaddressbook +%{_kf5_datadir}/kconf_update/kaddressbook-15.08-kickoff.sh +%{_kf5_datadir}/kconf_update/kaddressbook.upd # Kontact integration -%{_kde4_libdir}/kde4/kontact_kaddressbookplugin.so -%{_kde4_datadir}/kde4/services/kontact/kaddressbookplugin.desktop -%{_kde4_appsdir}/kontact/ksettingsdialog/kaddressbook.setdlg +%{_kf5_qtplugindir}/kontact_kaddressbookplugin.so +%{_kf5_datadir}/kservices5/kontact/kaddressbookplugin.desktop +%{_kf5_datadir}/kontact/ksettingsdialog/kaddressbook.setdlg +%{_sysconfdir}/xdg/kaddressbook_themes.knsrc # grantleeeditor -%{_kde4_bindir}/contactthemeeditor -%{_kde4_appsdir}/contactthemeeditor/ -%{_kde4_datadir}/applications/kde4/contactthemeeditor.desktop +%{_kf5_bindir}/contactthemeeditor +%{_kf5_datadir}/doc/HTML/en/contactthemeeditor +%{_kf5_datadir}/applications/org.kde.contactthemeeditor.desktop # libkdepim -%{_kde4_libdir}/kde4/kcm_ldap.so -%{_kde4_datadir}/kde4/services/kcmldap.desktop +%{_kf5_qtplugindir}/kcm_ldap.so +%{_kf5_datadir}/kservices5/kcmldap.desktop +%{_kf5_datadir}/appdata/kaddressbook.appdata.xml +%{_kf5_datadir}/kxmlgui5/kaddressbook/kaddressbookui.rc %{_datadir}/dbus-1/interfaces/org.kde.addressbook.service.xml %post -n kaddressbook-libs -p /sbin/ldconfig %postun -n kaddressbook-libs -p /sbin/ldconfig %files -n kaddressbook-libs -%{_kde4_libdir}/libkaddressbookprivate.so.* +%{_kf5_libdir}/libkaddressbookprivate.so.* # kaddressbookgrantlee -%{_kde4_libdir}/libkaddressbookgrantlee.so.* +%{_kf5_libdir}/libKF5KaddressbookGrantlee.so.* %post -n kalarm -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_kf5_datadir}/hicolor &> /dev/null ||: %posttrans -n kalarm -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/hicolor &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun -n kalarm @@ -650,61 +659,30 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files -n kalarm -f kalarm.lang -%{_kde4_bindir}/kalarm -%{_kde4_bindir}/kalarmautostart -%{_kde4_datadir}/applications/kde4/kalarm.desktop +%files -n kalarm +# -f kalarm.lang +%{_kf5_bindir}/kalarm +%{_kf5_bindir}/kalarmautostart +%{_libexecdir}/kalarm_helper +%{_kf5_datadir}/applications/org.kde.kalarm.desktop %{_sysconfdir}/xdg/autostart/kalarm.autostart.desktop -%{_kde4_datadir}/config.kcfg/kalarmconfig.kcfg -%{_kde4_appsdir}/kalarm/ -%{_kde4_appsdir}/kconf_update/kalarm* -%{_kde4_libexecdir}/kalarm_helper +%{_kf5_datadir}/config.kcfg/kalarmconfig.kcfg +%{_kf5_datadir}/kalarm/ +%{_kf5_datadir}/kconf_update/kalarm* %{_sysconfdir}/dbus-1/system.d/org.kde.kalarmrtcwake.conf %{_datadir}/dbus-1/system-services/org.kde.kalarmrtcwake.service %{_datadir}/dbus-1/interfaces/org.kde.kalarm.kalarm.xml %{_datadir}/polkit-1/actions/org.kde.kalarmrtcwake.policy -%{_kde4_datadir}/icons/hicolor/*/apps/kalarm.* - -%post -n kjots -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: -touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: - -%posttrans -n kjots -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: -update-desktop-database -q &> /dev/null ||: - -%postun -n kjots -if [ $1 -eq 0 ] ; then - update-desktop-database -q &> /dev/null ||: -fi - -%files -n kjots -f kjots.lang -%{_kde4_bindir}/kjots -%{_kde4_libdir}/kde4/kjotspart.so -%{_kde4_libdir}/kde4/kcm_kjots.so -%{_kde4_datadir}/kde4/services/kjotspart.desktop -%{_kde4_datadir}/kde4/services/kjots_config_misc.desktop -%{_kde4_datadir}/applications/kde4/Kjots.desktop -%{_kde4_datadir}/config.kcfg/kjots.kcfg -%{_kde4_appsdir}/kjots/ -%{_kde4_datadir}/icons/hicolor/*/apps/kjots.* -%{_kde4_datadir}/icons/oxygen/*/actions/edit-delete-page.* -%{_kde4_libdir}/kde4/plasma_applet_akonotes_note.so -%{_kde4_datadir}/kde4/services/akonotes_note.desktop -%{_kde4_libdir}/kde4/plasma_applet_akonotes_list.so -%{_kde4_datadir}/kde4/services/akonotes_list.desktop -%{_kde4_appsdir}/desktoptheme/default/widgets/stickynote.svgz -# Kontact integration -%{_kde4_libdir}/kde4/kontact_kjotsplugin.so -%{_kde4_datadir}/kde4/services/kontact/kjots_plugin.desktop -%{_kde4_appsdir}/kontact/ksettingsdialog/kjots.setdlg +%{_kf5_datadir}/icons/hicolor/*/apps/kalarm.* +%{_kf5_datadir}/appdata/kalarm.appdata.xml +%{_kf5_datadir}/kxmlgui5/kalarm/kalarmui.rc +%{_kf5_datadir}/doc/HTML/en/kalarm/ %post -n kleopatra -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_kf5_datadir}/hicolor &> /dev/null ||: %posttrans -n kleopatra -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/hicolor &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun -n kleopatra @@ -712,36 +690,39 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files -n kleopatra -f kleopatra-all.lang -%{_kde4_bindir}/kleopatra -%{_kde4_bindir}/kgpgconf -%{_kde4_bindir}/kwatchgnupg -%{_kde4_datadir}/applications/kde4/kleopatra.desktop -%{_kde4_datadir}/applications/kde4/kleopatra_import.desktop -%{_kde4_datadir}/kde4/services/kleopatra_*.desktop -%{_kde4_appsdir}/kleopatra/ -%{_kde4_appsdir}/kwatchgnupg/ -%{_kde4_libdir}/kde4/kcm_kleopatra.so -%{_kde4_datadir}/icons/hicolor/*/apps/kleopatra.* +%files -n kleopatra +# -f kleopatra-all.lang +%{_kf5_bindir}/kleopatra +%{_kf5_bindir}/kwatchgnupg +%{_kf5_datadir}/applications/org.kde.kleopatra.desktop +%{_kf5_datadir}/applications/kleopatra_import.desktop +%{_kf5_datadir}/kconf_update/kleopatra-15.08-kickoff.sh +%{_kf5_datadir}/kconf_update/kleopatra.upd +%{_kf5_datadir}/kservices5/kleopatra_*.desktop +%{_kf5_datadir}/kleopatra/ +%{_kf5_datadir}/kwatchgnupg/ +%{_kf5_datadir}/doc/HTML/en/kwatchgnupg/ +%{_kf5_qtplugindir}/kcm_kleopatra.so +%{_kf5_datadir}/icons/hicolor/*/apps/kleopatra.* +%{_kf5_datadir}/appdata/kleopatra.appdata.xml +%{_kf5_datadir}/doc/HTML/en/kleopatra/ %post -n kleopatra-libs -p /sbin/ldconfig %postun -n kleopatra-libs -p /sbin/ldconfig %files -n kleopatra-libs -%{_kde4_libdir}/libkleopatraclientcore.so.* -%{_kde4_libdir}/libkleopatraclientgui.so.* # libkleo -%{_kde4_datadir}/config/libkleopatrarc -%{_kde4_appsdir}/libkleopatra/ -%{_kde4_libdir}/libkleo.so.* +%{_sysconfdir}/xdg/libkleopatrarc +%{_kf5_datadir}/libkleopatra/ +%{_kf5_libdir}/libKF5Libkleo.so.* %post -n kmail -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: -touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: +touch --no-create %{_kf5_datadir}/hicolor &> /dev/null ||: +touch --no-create %{_kf5_datadir}/oxygen &> /dev/null ||: %posttrans -n kmail -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/oxygen &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun -n kmail @@ -749,153 +730,121 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files -n kmail -f kmail-all.lang -%{_kde4_bindir}/kmail -%{_kde4_bindir}/kmail_*.sh -%{_kde4_libdir}/kde4/kcm_kpimidentities.so -%{_kde4_libdir}/kde4/kmailpart.so -%{_kde4_libdir}/kde4/kcm_kmail.so -%{_kde4_datadir}/applications/kde4/KMail2.desktop -%{_kde4_datadir}/applications/kde4/kmail_view.desktop -%{_kde4_datadir}/config.kcfg/kmail.kcfg -%{_kde4_datadir}/config/kmail* -%{_kde4_appsdir}/kmail2/ -%{_kde4_datadir}/kde4/services/kmail_*.desktop -%{_kde4_datadir}/kde4/services/kcm_kpimidentities.desktop -%{_kde4_datadir}/kde4/servicetypes/dbusmail.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/kmail_addattachmentservicemenu.desktop +%files -n kmail +# -f kmail-all.lang +%{_kf5_bindir}/kmail +%{_kf5_qtplugindir}/kcm_kpimidentities.so +%{_kf5_qtplugindir}/kmailpart.so +%{_kf5_qtplugindir}/kcm_kmail.so +%{_kf5_datadir}/applications/org.kde.kmail.desktop +%{_kf5_datadir}/config.kcfg/kmail.kcfg +%{_kf5_datadir}/kmail2/ +%{_kf5_datadir}/kservices5/kmail_*.desktop +%{_kf5_datadir}/kservices5/kcm_kpimidentities.desktop +%{_kf5_datadir}/kservicetypes5/dbusmail.desktop +%{_kf5_datadir}/kservices5/ServiceMenus/kmail_addattachmentservicemenu.desktop %{_datadir}/dbus-1/interfaces/org.kde.kmail.*.xml -%{_kde4_datadir}/icons/hicolor/*/apps/kmail.* -%{_kde4_appsdir}/kconf_update/kmail.upd -%{_kde4_appsdir}/kconf_update/upgrade-transport.pl -%{_kde4_appsdir}/kconf_update/upgrade-signature.pl -%{_kde4_appsdir}/kconf_update/kmail-* +%{_kf5_datadir}/icons/hicolor/*/apps/kmail.* +%{_kf5_datadir}/kconf_update/kmail.upd +%{_kf5_datadir}/applications/kmail_view.desktop +%{_kf5_datadir}/doc/HTML/en/kmail/ +%{_kf5_datadir}/knotifications5/kmail2.notifyrc +%{_kf5_datadir}/kxmlgui5/kmail2/ +%{_kf5_datadir}/kconf_update/kmail-* # Kontact integration -%{_kde4_libdir}/kde4/kontact_kmailplugin.so -%{_kde4_libdir}/kde4/kcm_kmailsummary.so -%{_kde4_datadir}/kde4/services/kontact/kmailplugin.desktop -%{_kde4_datadir}/kde4/services/kcmkmailsummary.desktop -%{_kde4_appsdir}/kontact/ksettingsdialog/kmail.setdlg +%{_kf5_qtplugindir}/kontact_kmailplugin.so +%{_kf5_qtplugindir}/kcm_kmailsummary.so +%{_kf5_datadir}/kservices5/kontact/kmailplugin.desktop +%{_kf5_datadir}/kservices5/kcmkmailsummary.desktop # agents -%{_kde4_datadir}/akonadi/agents/*.desktop -%{_kde4_bindir}/akonadi_*_agent -%{_kde4_appsdir}/kconf_update/migrate-kmail-filters.pl -%{_kde4_appsdir}/kconf_update/noteglobalsettings.upd -%{_kde4_appsdir}/kconf_update/mailfilteragent.upd -%{_kde4_appsdir}/akonadi_sendlater_agent/ -%{_kde4_appsdir}/akonadi_archivemail_agent/ -%{_kde4_appsdir}/akonadi_followupreminder_agent/ -%{_kde4_appsdir}/akonadi_mailfilter_agent/ -%{_kde4_appsdir}/akonadi_notes_agent/ +%{_kf5_datadir}/akonadi/agents/*.desktop +%{_kf5_bindir}/akonadi_*_agent +%{_kf5_datadir}/knotifications5/akonadi_archivemail_agent.notifyrc +%{_kf5_datadir}/knotifications5/akonadi_followupreminder_agent.notifyrc +%{_kf5_datadir}/knotifications5/akonadi_mailfilter_agent.notifyrc +%{_kf5_datadir}/knotifications5/akonadi_notes_agent.notifyrc +%{_kf5_datadir}/knotifications5/akonadi_sendlater_agent.notifyrc +%{_kf5_datadir}/doc/HTML/en/akonadi_archivemail_agent/ +%{_kf5_datadir}/doc/HTML/en/akonadi_followupreminder_agent/ +%{_kf5_datadir}/doc/HTML/en/akonadi_notes_agent/ +%{_kf5_datadir}/doc/HTML/en/akonadi_sendlater_agent/ # grantleetheme -%{_kde4_bindir}/headerthemeeditor -%{_kde4_appsdir}/headerthemeeditor/ -%{_kde4_datadir}/applications/kde4/headerthemeeditor.desktop +%{_kf5_bindir}/headerthemeeditor +%{_kf5_datadir}/doc/HTML/en/headerthemeeditor/ +%{_kf5_datadir}/applications/org.kde.headerthemeeditor.desktop # icons -%{_kde4_datadir}/icons/oxygen/*/mimetypes/x-mail-distribution-list.* -# kmailcvt -%{_kde4_bindir}/kmailcvt -%{_kde4_appsdir}/kmailcvt/ -%{_kde4_datadir}/icons/hicolor/*/apps/kmailcvt.* -# ksendemail -%{_kde4_bindir}/ksendemail +%{_kf5_datadir}/icons/oxygen/*/mimetypes/x-mail-distribution-list.* # ktneff -%{_kde4_bindir}/ktnef -%{_kde4_datadir}/applications/kde4/ktnef.desktop -%{_kde4_appsdir}/ktnef/ -%{_kde4_datadir}/icons/*/*/actions/ktnef_extract_all_to.png -%{_kde4_datadir}/icons/*/*/actions/ktnef_extract_to.png -%{_kde4_datadir}/icons/*/*/apps/ktnef.png +%{_kf5_bindir}/ktnef +%{_kf5_datadir}/applications/org.kde.ktnef.desktop +%{_kf5_datadir}/doc/HTML/en/ktnef/ +%{_kf5_datadir}/icons/*/*/actions/ktnef_extract_all_to.png +%{_kf5_datadir}/icons/*/*/actions/ktnef_extract_to.png +%{_kf5_datadir}/icons/*/*/apps/ktnef.png # libkdepim %{_datadir}/dbus-1/interfaces/org.kde.mailtransport.service.xml # libksieve -%{_kde4_datadir}/config/ksieve_script.knsrc -%{_kde4_appsdir}/sieve/ +%{_sysconfdir}/xdg/ksieve_script.knsrc +%{_kf5_datadir}/sieve/ # mailcommon -%{_kde4_libdir}/kde4/plugins/designer/mailcommonwidgets.so +%{_kf5_qtplugindir}/designer/mailcommonwidgets.so # mboximporter -%{_kde4_bindir}/mboximporter -%{_kde4_datadir}/applications/kde4/mboximporter.desktop +%{_kf5_bindir}/mboximporter +%{_kf5_datadir}/applications/org.kde.mboximporter.desktop # messagelist -%{_kde4_appsdir}/messagelist/ +%{_kf5_datadir}/messagelist/ # messageviewer -%{_kde4_appsdir}/messageviewer/ -%{_kde4_appsdir}/libmessageviewer/ -%{_kde4_datadir}/config/messageviewer_header_themes.knsrc -%{_kde4_libdir}/kde4/plugins/accessible/messagevieweraccessiblewidgetfactory.so -%dir %{_kde4_libdir}/kde4/plugins/grantlee/ -%dir %{_kde4_libdir}/kde4/plugins/grantlee/*/ -%{_kde4_libdir}/kde4/plugins/grantlee/*/grantlee_messageheaderfilters.so +%{_kf5_datadir}/messageviewer/ +%{_kf5_datadir}/libmessageviewer/ +%{_kf5_datadir}/kconf_update/messageviewer.upd +%{_kf5_datadir}/knotifications5/messageviewer.notifyrc +%{_sysconfdir}/xdg/messageviewer_header_themes.knsrc +%dir %{_kf5_qtplugindir}/grantlee/ +%dir %{_kf5_qtplugindir}/grantlee/*/ +%{_kf5_qtplugindir}/grantlee/*/grantlee_messageheaderfilters.so # plugins -%{_kde4_libdir}/kde4/messageviewer_*.so +%{_kf5_qtplugindir}/messageviewer_*.so +%{_kf5_qtplugindir}/messageviewer/messageviewer_*.so # sieveeditor -%{_kde4_bindir}/sieveeditor -%{_kde4_appsdir}/sieveeditor/ -%{_kde4_datadir}/applications/kde4/sieveeditor.desktop +%{_kf5_bindir}/sieveeditor +%{_kf5_datadir}/kconf_update/sieveeditor-15.08-kickoff.sh +%{_kf5_datadir}/kconf_update/sieveeditor.upd +%{_kf5_datadir}/appdata/org.kde.kmail.appdata.xml +%{_kf5_datadir}/doc/HTML/en/sieveeditor/ +%{_kf5_datadir}/applications/org.kde.sieveeditor.desktop +%{_sysconfdir}/xdg/kmail.antispamrc +%{_sysconfdir}/xdg/kmail.antivirusrc %post -n kmail-libs -p /sbin/ldconfig %postun -n kmail-libs -p /sbin/ldconfig %files -n kmail-libs -%{_kde4_libdir}/libkmailprivate.so.* +%{_kf5_libdir}/libkmailprivate.so.* # agents -%{_kde4_libdir}/libfollowupreminder.so.* -%{_kde4_libdir}/libsendlater.so.* +%{_kf5_libdir}/libKF5FollowupReminder.so.* +%{_kf5_libdir}/libKF5SendLater.so.* # libsieve -%{_kde4_libdir}/libksieve.so.* -%{_kde4_libdir}/libkmanagesieve.so.* -%{_kde4_libdir}/libksieveui.so.* +%{_kf5_libdir}/libKF5KSieve.so.* +%{_kf5_libdir}/libKF5KManageSieve.so.* +%{_kf5_libdir}/libKF5KSieveUi.so.* # mailcommon -%{_kde4_libdir}/libmailcommon.so.* +%{_kf5_libdir}/libKF5MailCommon.so.* # mailimporter -%{_kde4_libdir}/libmailimporter.so.* +%{_kf5_libdir}/libKF5MailImporter.so.* # messagecompoer -%{_kde4_libdir}/libmessagecomposer.so.* +%{_kf5_libdir}/libKF5MessageComposer.so.* # messagecore -%{_kde4_libdir}/libmessagecore.so.* +%{_kf5_libdir}/libKF5MessageCore.so.* # messagelist -%{_kde4_libdir}/libmessagelist.so.* +%{_kf5_libdir}/libKF5MessageList.so.* # messageviewer -%{_kde4_libdir}/libmessageviewer.so.* - -%post -n knode -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - -%posttrans -n knode -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -update-desktop-database -q &> /dev/null ||: - -%postun -n knode -if [ $1 -eq 0 ] ; then - update-desktop-database -q &> /dev/null ||: -fi - -%files -n knode -f knode.lang -%{_kde4_bindir}/knode -%{_kde4_libdir}/kde4/kcm_knode.so -%{_kde4_libdir}/kde4/knodepart.so -%{_kde4_datadir}/applications/kde4/KNode.desktop -%{_kde4_datadir}/kde4/services/knode_*.desktop -%{_kde4_appsdir}/knode/ -%{_kde4_appsdir}/kconf_update/knode.upd -%{_datadir}/dbus-1/interfaces/org.kde.knode.xml -%{_kde4_datadir}/icons/hicolor/*/apps/knode.* -# Kontact integration -%{_kde4_libdir}/kde4/kontact_knodeplugin.so -%{_kde4_datadir}/kde4/services/kontact/knodeplugin.desktop -%{_kde4_appsdir}/kontact/ksettingsdialog/knode.setdlg - -%post -n knode-libs -p /sbin/ldconfig -%postun -n knode-libs -p /sbin/ldconfig - -%files -n knode-libs -%{_kde4_libdir}/libknodecommon.so.* +%{_kf5_libdir}/libKF5MessageViewer.so.* %post -n knotes -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_kf5_datadir}/hicolor &> /dev/null ||: %posttrans -n knotes -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/hicolor &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun -n knotes @@ -903,38 +852,43 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files -n knotes -f knotes.lang -%{_kde4_bindir}/knotes -%{_kde4_libdir}/kde4/kcm_knote.so -%{_kde4_datadir}/kde4/services/knote_*.desktop -%{_kde4_datadir}/applications/kde4/knotes.desktop +%files -n knotes +# -f knotes.lang +%{_kf5_bindir}/knotes +%{_kf5_qtplugindir}/kcm_knote.so +%{_kf5_datadir}/kservices5/knote_*.desktop +%{_kf5_datadir}/applications/org.kde.knotes.desktop %{_datadir}/dbus-1/interfaces/org.kde.KNotes.xml %{_datadir}/dbus-1/interfaces/org.kde.kontact.KNotes.xml -%{_kde4_appsdir}/knotes -%{_kde4_datadir}/icons/hicolor/*/apps/knotes.* -%{_kde4_datadir}/icons/hicolor/*/actions/knotes_*.png -%{_kde4_datadir}/config.kcfg/knotesglobalconfig.kcfg -%{_kde4_datadir}/config/knotes_printing_theme.knsrc +%{_kf5_datadir}/knotes +%{_kf5_datadir}/icons/hicolor/*/apps/knotes.* +%{_kf5_datadir}/icons/hicolor/*/actions/knotes_*.png +%{_kf5_datadir}/config.kcfg/knotesglobalconfig.kcfg +%{_sysconfdir}/xdg/knotes_printing_theme.knsrc # Kontact integration -%{_kde4_libdir}/kde4/kontact_knotesplugin.so -%{_kde4_libdir}/kde4/kcm_knotessummary.so -%{_kde4_datadir}/kde4/services/kontact/knotesplugin.desktop -%{_kde4_datadir}/kde4/services/kcmknotessummary.desktop -%{_kde4_appsdir}/kontact/ksettingsdialog/knotes.setdlg +%{_kf5_qtplugindir}/kontact_knotesplugin.so +%{_kf5_qtplugindir}/kcm_knotessummary.so +%{_kf5_datadir}/kservices5/kontact/knotesplugin.desktop +%{_kf5_datadir}/kservices5/kcmknotessummary.desktop +%{_kf5_datadir}/kconf_update/knotes-15.08-kickoff.sh +%{_kf5_datadir}/kconf_update/knotes.upd +%{_kf5_datadir}/appdata/knotes.appdata.xml +%{_kf5_datadir}/kxmlgui5/knotes/ +%{_kf5_datadir}/doc/HTML/en/knotes/ %post -n knotes-libs -p /sbin/ldconfig %postun -n knotes-libs -p /sbin/ldconfig %files -n knotes-libs -%{_kde4_libdir}/libknotesprivate.so.* +%{_kf5_libdir}/libknotesprivate.so.* # noteshared -%{_kde4_libdir}/libnoteshared.so.* +%{_kf5_libdir}/libKF5NoteShared.so.* %post -n kontact -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_kf5_datadir}/hicolor &> /dev/null ||: %posttrans -n kontact -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/hicolor &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun -n kontact @@ -942,43 +896,50 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files -n kontact -f kontact-all.lang -%{_kde4_bindir}/kontact -%{_kde4_libdir}/kde4/kcm_kontact.so -%{_kde4_datadir}/applications/kde4/Kontact.desktop -%{_kde4_datadir}/applications/kde4/kontact-admin.desktop -%{_kde4_datadir}/config.kcfg/kontact.kcfg -%{_kde4_datadir}/kde4/services/kontactconfig.desktop -%{_kde4_appsdir}/kontact -%exclude %{_kde4_appsdir}/kontact/ksettingsdialog -%{_kde4_datadir}/icons/hicolor/*/apps/kontact.* +%files -n kontact +# -f kontact-all.lang +%{_kf5_bindir}/kontact +%{_kf5_qtplugindir}/kcm_kontact.so +%{_kf5_datadir}/applications/org.kde.kontact.desktop +%{_kf5_datadir}/applications/kontact-admin.desktop +%{_kf5_datadir}/config.kcfg/kontact.kcfg +%{_kf5_datadir}/kservices5/kontactconfig.desktop +%{_kf5_datadir}/kontact +%exclude %{_kf5_datadir}/kontact/ksettingsdialog +%{_kf5_datadir}/icons/hicolor/*/apps/kontact.* # Summary page -%{_kde4_libdir}/kde4/kontact_summaryplugin.so -%{_kde4_libdir}/kde4/kcm_kontactsummary.so -%{_kde4_datadir}/kde4/services/kontact/summaryplugin.desktop -%{_kde4_datadir}/kde4/services/kcmkontactsummary.desktop -%{_kde4_appsdir}/kontactsummary -%{_kde4_appsdir}/kontact/ksettingsdialog/summary.setdlg +%{_kf5_qtplugindir}/kontact_summaryplugin.so +%{_kf5_qtplugindir}/kcm_kontactsummary.so +%{_kf5_datadir}/kservices5/kontact/summaryplugin.desktop +%{_kf5_datadir}/kservices5/kcmkontactsummary.desktop +%{_kf5_datadir}/kxmlgui5/kontactsummary +%{_kf5_datadir}/kontact/ksettingsdialog/summary.setdlg # Special dates page -%{_kde4_libdir}/kde4/kontact_specialdatesplugin.so -%{_kde4_libdir}/kde4/kcm_sdsummary.so -%{_kde4_datadir}/kde4/services/kontact/specialdatesplugin.desktop -%{_kde4_datadir}/kde4/services/kcmsdsummary.desktop -%{_kde4_appsdir}/kontact/ksettingsdialog/specialdates.setdlg +%{_kf5_qtplugindir}/kontact_specialdatesplugin.so +%{_kf5_qtplugindir}/kcm_sdsummary.so +%{_kf5_datadir}/kservices5/kontact/specialdatesplugin.desktop +%{_kf5_datadir}/kservices5/kcmsdsummary.desktop +%{_kf5_datadir}/kontact/ksettingsdialog/specialdates.setdlg +%{_kf5_datadir}/kconf_update/kontact-15.08-kickoff.sh +%{_kf5_datadir}/kconf_update/kontact.upd +%{_kf5_datadir}/appdata/Kontact.appdata.xml +%{_kf5_datadir}/doc/HTML/en/kontact-admin +%{_kf5_datadir}/doc/HTML/en/kontact +%{_kf5_datadir}/kxmlgui5/kontact/ %post -n kontact-libs -p /sbin/ldconfig %postun -n kontact-libs -p /sbin/ldconfig %files -n kontact-libs -%{_kde4_libdir}/libkontactprivate.so.* +%{_kf5_libdir}/libkontactprivate.so.* %post -n korganizer -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: -touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: +touch --no-create %{_kf5_datadir}/hicolor &> /dev/null ||: +touch --no-create %{_kf5_datadir}/oxygen &> /dev/null ||: %posttrans -n korganizer -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/oxygen &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun -n korganizer @@ -986,81 +947,67 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files -n korganizer -f korganizer.lang -%{_kde4_bindir}/korganizer -%{_kde4_bindir}/ical2vcal -%{_kde4_libdir}/kde4/kcm_korganizer.so -%{_kde4_libdir}/kde4/korganizerpart.so -%{_kde4_libdir}/kde4/korg_*.so -%{_kde4_datadir}/config.kcfg/korganizer.kcfg -%{_kde4_appsdir}/kconf_update/korganizer.upd -%{_kde4_datadir}/kde4/services/webcal.protocol +%files -n korganizer +# -f korganizer.lang +%{_kf5_bindir}/korganizer +%{_kf5_bindir}/ical2vcal +%{_kf5_qtplugindir}/kcm_korganizer.so +%{_kf5_qtplugindir}/korganizerpart.so +%{_kf5_qtplugindir}/korg_*.so +%{_kf5_datadir}/config.kcfg/korganizer.kcfg +%{_kf5_datadir}/kconf_update/korganizer.upd +%{_kf5_datadir}/kconf_update/korganizer-15.08-kickoff.sh +%{_kf5_datadir}/kservices5/webcal.protocol %{_datadir}/dbus-1/interfaces/org.kde.Korganizer.*.xml %{_datadir}/dbus-1/interfaces/org.kde.korganizer.*.xml -%{_kde4_datadir}/config/korganizer.knsrc -%{_kde4_datadir}/applications/kde4/korganizer.desktop -%{_kde4_datadir}/applications/kde4/korganizer-import.desktop -%{_kde4_appsdir}/korganizer -%{_kde4_datadir}/icons/hicolor/*/apps/korg-journal.* -%{_kde4_datadir}/icons/hicolor/*/apps/korg-todo.* -%{_kde4_datadir}/icons/hicolor/*/apps/korganizer.* -%{_kde4_datadir}/icons/oxygen/*/actions/smallclock.png -%{_kde4_datadir}/icons/oxygen/*/actions/upindicator.png -%{_kde4_datadir}/icons/oxygen/*/actions/checkmark.png -%{_kde4_datadir}/kde4/services/korganizer -%{_kde4_datadir}/kde4/services/korganizer_*.desktop -%{_kde4_datadir}/kde4/servicetypes/dbuscalendar.desktop +%{_sysconfdir}/xdg/korganizer.knsrc +%{_kf5_datadir}/applications/org.kde.korganizer.desktop +%{_kf5_datadir}/applications/korganizer-import.desktop +%{_kf5_datadir}/korganizer +%{_kf5_datadir}/icons/hicolor/*/apps/korg-journal.* +%{_kf5_datadir}/icons/hicolor/*/apps/korg-todo.* +%{_kf5_datadir}/icons/hicolor/*/apps/korganizer.* +%{_kf5_datadir}/icons/oxygen/*/actions/smallclock.png +%{_kf5_datadir}/icons/oxygen/*/actions/upindicator.png +%{_kf5_datadir}/icons/oxygen/*/actions/checkmark.png +%{_kf5_datadir}/kservices5/korganizer +%{_kf5_datadir}/kservices5/korganizer_*.desktop +%{_kf5_datadir}/kservicetypes5/dbuscalendar.desktop # Kontact integration -%{_kde4_libdir}/kde4/kcm_apptsummary.so -%{_kde4_libdir}/kde4/kcm_todosummary.so -%{_kde4_libdir}/kde4/kontact_korganizerplugin.so -%{_kde4_libdir}/kde4/kontact_todoplugin.so -%{_kde4_libdir}/kde4/kontact_journalplugin.so -%{_kde4_datadir}/kde4/services/kontact/korganizerplugin.desktop -%{_kde4_datadir}/kde4/services/kontact/todoplugin.desktop -%{_kde4_datadir}/kde4/services/kontact/journalplugin.desktop -%{_kde4_datadir}/kde4/services/kcmapptsummary.desktop -%{_kde4_datadir}/kde4/services/kcmtodosummary.desktop -%{_kde4_appsdir}/kontact/ksettingsdialog/korganizer.setdlg +%{_kf5_qtplugindir}/kcm_apptsummary.so +%{_kf5_qtplugindir}/kcm_todosummary.so +%{_kf5_qtplugindir}/kontact_korganizerplugin.so +%{_kf5_qtplugindir}/kontact_todoplugin.so +%{_kf5_qtplugindir}/kontact_journalplugin.so +%{_kf5_datadir}/kservices5/kontact/korganizerplugin.desktop +%{_kf5_datadir}/kservices5/kontact/todoplugin.desktop +%{_kf5_datadir}/kservices5/kontact/journalplugin.desktop +%{_kf5_datadir}/kservices5/kcmapptsummary.desktop +%{_kf5_datadir}/kservices5/kcmtodosummary.desktop +%{_kf5_datadir}/appdata/korganizer.appdata.xml +%{_kf5_datadir}/doc/HTML/en/korganizer/ +%{_kf5_datadir}/kxmlgui5/korganizer/ # korgac -%{_kde4_bindir}/korgac -%{_sysconfdir}/xdg/autostart/korgac.desktop -%{_kde4_appsdir}/korgac -%{_kde4_configdir}/korgacrc +%{_kf5_bindir}/korgac +%{_sysconfdir}/xdg/autostart/org.kde.korgac.desktop +%{_kf5_datadir}/korgac %post -n korganizer-libs -p /sbin/ldconfig %postun -n korganizer-libs -p /sbin/ldconfig %files -n korganizer-libs -%{_kde4_libdir}/libkorganizer_interfaces.so.* -%{_kde4_libdir}/libkorganizer_core.so.* -%{_kde4_libdir}/libkorganizerprivate.so.* - -%post -n ktimetracker -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - -%posttrans -n ktimetracker -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -update-desktop-database -q &> /dev/null ||: +%{_kf5_libdir}/libkorganizer_interfaces.so.* +%{_kf5_libdir}/libkorganizer_core.so.* +%{_kf5_libdir}/libkorganizerprivate.so.* -%postun -n ktimetracker -if [ $1 -eq 0 ] ; then - update-desktop-database -q &> /dev/null ||: -fi -%files -n ktimetracker -f ktimetracker.lang -%{_kde4_bindir}/karm -%{_kde4_bindir}/ktimetracker -%{_kde4_libdir}/kde4/kcm_ktimetracker.so -%{_kde4_libdir}/kde4/ktimetrackerpart.so -%{_kde4_datadir}/kde4/services/ktimetracker*.desktop -%{_kde4_appsdir}/ktimetracker -%{_kde4_datadir}/icons/hicolor/*/apps/ktimetracker.* -%{_datadir}/dbus-1/interfaces/org.kde.ktimetracker.ktimetracker.xml -%{_kde4_datadir}/applications/kde4/ktimetracker.desktop +%changelog +* Mon Dec 07 2015 Jan Grulich - 7:15.11.90-1 +- Update to 15.11.90 +* Tue Aug 25 2015 Daniel Vrátil - 7:15.08.0-1 +- 15.08.0 -%changelog * Wed Nov 11 2015 Rex Dieter 7:4.14.10-8 - create/own empty korgacrc (#1268342) diff --git a/sources b/sources index 941dcf7..4ff7aec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a09c9bd838cd71c16e9993e57653a7ad kdepim-4.14.10.tar.xz +ef9439f4775711848cb25eb8fbd8b03b kdepim-15.11.90.tar.xz