diff --git a/desktop/kde/applications/akonadi-import-wizard/pspec.xml b/desktop/kde/applications/akonadi-import-wizard/pspec.xml
index f3696de3d4..116b117b1a 100755
--- a/desktop/kde/applications/akonadi-import-wizard/pspec.xml
+++ b/desktop/kde/applications/akonadi-import-wizard/pspec.xml
@@ -1,143 +1,147 @@
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
-    <Source>
-        <Name>akonadi-import-wizard</Name>
-        <Homepage>https://community.kde.org/KDE_PIM</Homepage>
-        <Packager>
-            <Name>Stefan Gronewold</Name>
-            <Email>groni@pisilinux.org</Email>
-        </Packager>
-        <License>GPLv2</License>
-        <Summary>CLI tools to manage akonadi calendars</Summary>
-        <Description>Import data from other mail clients to kmail</Description>
-        <Archive sha1sum="47ce4622891cae1b9f2fdd8206031580fdb40fc8" type="tarxz">https://download.kde.org/stable/release-service/25.04.1/src/akonadi-import-wizard-25.04.1.tar.xz</Archive>
-        <BuildDependencies>
-            <Dependency>boost-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-calendar-devel</Dependency>
-            <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>kio-devel</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency>qt6-base-devel</Dependency>
-            <Dependency>qt6-keychain-devel</Dependency>
-            <Dependency>kcompletion-devel</Dependency>
-            <Dependency>kxmlgui-devel</Dependency>
-            <Dependency>kitemmodels-devel</Dependency>
-            <Dependency>kcontacts-devel</Dependency>
-            <Dependency>kcalendarcore-devel</Dependency>
-            <Dependency>kiconthemes-devel</Dependency>
-            <Dependency>kunitconversion-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-contacts-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kcalutils-devel</Dependency>
-            <Dependency versionFrom="25.04.1">libkdepim-devel</Dependency>
-            <Dependency versionFrom="25.04.1">calendarsupport-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kmime-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kidentitymanagement-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kmailtransport-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-mime-devel</Dependency>
-            <Dependency>cyrus-sasl-devel</Dependency>
-            <Dependency versionFrom="25.04.1">mailcommon-devel</Dependency>
-            <Dependency versionFrom="25.04.1">messagelib-devel</Dependency>
-            <Dependency versionFrom="25.04.1">pimcommon-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kimap-devel</Dependency>
-            <Dependency versionFrom="25.04.1">libkleo-devel</Dependency>
-            <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
-            <Dependency versionFrom="1.7.1">gpgme-qt6-devel</Dependency>
-            <Dependency versionFrom="25.04.1">mailimporter-devel</Dependency>
-            <Dependency>ffmpeg-devel</Dependency>
-            <Dependency>libXScrnSaver-devel</Dependency>
-        </BuildDependencies>
-    </Source>
-
-    <Package>
-        <Name>akonadi-import-wizard</Name>
-        <Summary>Import data from other mail clients to kmail</Summary>
-        <RuntimeDependencies>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kcrash</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>akonadi</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kwallet</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>qt6-base</Dependency>
-            <Dependency>qt6-keychain</Dependency>
-            <Dependency>kcontacts</Dependency>
-            <Dependency>libkdepim</Dependency>
-            <Dependency>pimcommon</Dependency>
-            <Dependency>mailcommon</Dependency>
-            <Dependency>messagelib</Dependency>
-            <Dependency>kcompletion</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kdbusaddons</Dependency>
-            <Dependency>mailimporter</Dependency>
-            <Dependency>kmailtransport</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>kidentitymanagement</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="config">/etc/xdg</Path>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="data">/usr/share</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="library">/usr/lib</Path>
-        </Files>
-        <Replaces>
-            <Package>akonadi-import-wizard-kf6</Package>
-        </Replaces>
-    </Package>
-
-    <Package>
-        <Name>akonadi-import-wizard-devel</Name>
-        <Summary>Development files for akonadi-import-wizard</Summary>
-        <RuntimeDependencies>
-            <Dependency release="current">akonadi-import-wizard</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="header">/usr/include</Path>
-            <Path fileType="data">/usr/lib/cmake</Path>
-        </Files>
-        <Replaces>
-            <Package>akonadi-import-wizard-kf6-devel</Package>
-        </Replaces>
-    </Package>
-
-    <History>
-        <Update release="53">
-            <Date>2025-05-08</Date>
-            <Version>25.04.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="52">
-            <Date>2025-04-20</Date>
-            <Version>25.04.0</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="51">
-            <Date>2025-04-02</Date>
-            <Version>24.12.3</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="50">
-            <Date>2025-02-06</Date>
-            <Version>24.12.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="49">
-            <Date>2025-01-09</Date>
-            <Version>24.12.1</Version>
-            <Comment>First release</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-    </History>
+  <Source>
+    <Name>akonadi-import-wizard</Name>
+    <Homepage>https://community.kde.org/KDE_PIM</Homepage>
+    <Packager>
+      <Name>Stefan Gronewold</Name>
+      <Email>groni@pisilinux.org</Email>
+    </Packager>
+    <License>GPLv2</License>
+    <Summary>CLI tools to manage akonadi calendars</Summary>
+    <Description>Import data from other mail clients to kmail</Description>
+    <Archive sha1sum="561cbdb015cc9051493756b06d4cdb4ec5b58c2e" type="tarxz">https://download.kde.org/stable/release-service/25.04.2/src/akonadi-import-wizard-25.04.2.tar.xz</Archive>
+    <BuildDependencies>
+      <Dependency>kio-devel</Dependency>
+      <Dependency>boost-devel</Dependency>
+      <Dependency>ffmpeg-devel</Dependency>
+      <Dependency>kxmlgui-devel</Dependency>
+      <Dependency>qt6-base-devel</Dependency>
+      <Dependency>kdoctools-devel</Dependency>
+      <Dependency>kcontacts-devel</Dependency>
+      <Dependency>cyrus-sasl-devel</Dependency>
+      <Dependency>kcompletion-devel</Dependency>
+      <Dependency>kitemmodels-devel</Dependency>
+      <Dependency>kiconthemes-devel</Dependency>
+      <Dependency>qt6-keychain-devel</Dependency>
+      <Dependency>extra-cmake-modules</Dependency>
+      <Dependency>kcalendarcore-devel</Dependency>
+      <Dependency>libXScrnSaver-devel</Dependency>
+      <Dependency>kunitconversion-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kimap-devel</Dependency>
+      <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkleo-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kcalutils-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkdepim-devel</Dependency>
+      <Dependency versionFrom="25.04.2">pimcommon-devel</Dependency>
+      <Dependency versionFrom="1.7.1">qgpgme-qt6-devel</Dependency>
+      <Dependency versionFrom="25.04.2">mailcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">messagelib-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-mime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">mailimporter-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmailtransport-devel</Dependency>
+      <Dependency versionFrom="25.04.2">calendarsupport-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-calendar-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-contacts-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kidentitymanagement-devel</Dependency>
+    </BuildDependencies>
+  </Source>
+  <Package>
+    <Name>akonadi-import-wizard</Name>
+    <Summary>Import data from other mail clients to kmail</Summary>
+    <RuntimeDependencies>
+      <Dependency>ki18n</Dependency>
+      <Dependency>kcrash</Dependency>
+      <Dependency>libgcc</Dependency>
+      <Dependency>akonadi</Dependency>
+      <Dependency>kconfig</Dependency>
+      <Dependency>kwallet</Dependency>
+      <Dependency>kxmlgui</Dependency>
+      <Dependency>qt6-base</Dependency>
+      <Dependency>kcontacts</Dependency>
+      <Dependency>libkdepim</Dependency>
+      <Dependency>pimcommon</Dependency>
+      <Dependency>mailcommon</Dependency>
+      <Dependency>messagelib</Dependency>
+      <Dependency>kcompletion</Dependency>
+      <Dependency>kcoreaddons</Dependency>
+      <Dependency>kdbusaddons</Dependency>
+      <Dependency>qt6-keychain</Dependency>
+      <Dependency>mailimporter</Dependency>
+      <Dependency>kmailtransport</Dependency>
+      <Dependency>kwidgetsaddons</Dependency>
+      <Dependency>kidentitymanagement</Dependency>
+    </RuntimeDependencies>
+    <Files>
+      <Path fileType="config">/etc/xdg</Path>
+      <Path fileType="executable">/usr/bin</Path>
+      <Path fileType="data">/usr/share</Path>
+      <Path fileType="doc">/usr/share/doc</Path>
+      <Path fileType="library">/usr/lib</Path>
+    </Files>
+    <Replaces>
+      <Package>akonadi-import-wizard-kf6</Package>
+    </Replaces>
+  </Package>
+  <Package>
+    <Name>akonadi-import-wizard-devel</Name>
+    <Summary>Development files for akonadi-import-wizard</Summary>
+    <RuntimeDependencies>
+      <Dependency release="current">akonadi-import-wizard</Dependency>
+    </RuntimeDependencies>
+    <Files>
+      <Path fileType="header">/usr/include</Path>
+      <Path fileType="data">/usr/lib/cmake</Path>
+    </Files>
+    <Replaces>
+      <Package>akonadi-import-wizard-kf6-devel</Package>
+    </Replaces>
+  </Package>
+  <History>
+    <Update release="54">
+      <Date>2025-06-08</Date>
+      <Version>25.04.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="53">
+      <Date>2025-05-08</Date>
+      <Version>25.04.1</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="52">
+      <Date>2025-04-20</Date>
+      <Version>25.04.0</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="51">
+      <Date>2025-04-02</Date>
+      <Version>24.12.3</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="50">
+      <Date>2025-02-06</Date>
+      <Version>24.12.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="49">
+      <Date>2025-01-09</Date>
+      <Version>24.12.1</Version>
+      <Comment>First release</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+  </History>
 </PISI>
diff --git a/desktop/kde/applications/kaddressbook/pspec.xml b/desktop/kde/applications/kaddressbook/pspec.xml
index e90ff356c4..392f23dc2c 100755
--- a/desktop/kde/applications/kaddressbook/pspec.xml
+++ b/desktop/kde/applications/kaddressbook/pspec.xml
@@ -1,144 +1,145 @@
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
-    <Source>
-        <Name>kaddressbook</Name>
-        <Homepage>https://kontact.kde.org/</Homepage>
-        <Packager>
-            <Name>Stefan Gronewold</Name>
-            <Email>groni@pisilinux.org</Email>
-        </Packager>
-        <License>GPLv2</License>
-        <Summary>KDE contact manager</Summary>
-        <Description>kaddressbook reborn to make your data available to all your applications</Description>
-        <Archive sha1sum="a6aa877c5216e981238f5eaa21a62b2ff0decef3" type="tarxz">mirrors://kde/stable/release-service/25.04.1/src/kaddressbook-25.04.1.tar.xz</Archive>
-        <BuildDependencies>
-
-             <Dependency versionFrom="25.04.1">kimap-devel</Dependency>
-             <Dependency>kparts-devel</Dependency>
-             <Dependency>kcrash-devel</Dependency>
-             <Dependency>prison-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-devel</Dependency>
-             <Dependency versionFrom="25.04.1">libkleo-devel</Dependency>
-             <Dependency>kcmutils-devel</Dependency>
-             <Dependency>qt6-base-devel</Dependency>
-             <Dependency versionFrom="25.04.1">libkdepim-devel</Dependency>
-             <Dependency versionFrom="25.04.1">pimcommon-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kldap-devel</Dependency>
-             <Dependency>kdoctools-devel</Dependency>
-
-             <Dependency versionFrom="25.04.1">mailcommon-devel</Dependency>
-             <Dependency versionFrom="25.04.1">messagelib-devel</Dependency>
-             <Dependency>kdbusaddons-devel</Dependency>
-             <Dependency>cyrus-sasl-devel</Dependency>
-             <Dependency>kitemmodels-devel</Dependency>
-<!--              <Dependency>grantlee-qt5-devel</Dependency> -->
-             <Dependency versionFrom="25.04.1">akonadi-mime-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kpimtextedit-devel</Dependency>
-             <Dependency versionFrom="25.04.1">grantleetheme-devel</Dependency>
-             <Dependency>extra-cmake-modules</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-search-devel</Dependency>
-             <Dependency>kunitconversion-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kontactinterface-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-contacts-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kidentitymanagement-devel</Dependency>
-             <Dependency>kuserfeedback-devel</Dependency>
-             <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
-             <Dependency versionFrom="1.7.1">gpgme-qt6-devel</Dependency>
-        </BuildDependencies>
-    </Source>
-
-    <Package>
-        <Name>kaddressbook</Name>
-        <Summary>KDE contact manager</Summary>
-        <RuntimeDependencies>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kcrash</Dependency>
-            <Dependency>kparts</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>akonadi</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>kcmutils</Dependency>
-            <Dependency>qt6-base</Dependency>
-            <Dependency>kldap</Dependency>
-            <Dependency>kcontacts</Dependency>
-            <Dependency>libkdepim</Dependency>
-            <Dependency>pimcommon</Dependency>
-            <Dependency>kcompletion</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kiconthemes</Dependency>
-            <Dependency>kitemmodels</Dependency>
-            <Dependency>grantleetheme</Dependency>
-            <Dependency>akonadi-search</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>akonadi-contacts</Dependency>
-            <Dependency>kontactinterface</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="config">/etc/xdg</Path>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="data">/usr/share</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-        </Files>
-        <Replaces>
-            <Package>kaddressbook-kf6</Package>
-        </Replaces>
-    </Package>
-    
-    <Package>
-        <Name>kaddressbook-devel</Name>
-        <Summary>Development files for kaddressbook</Summary>
-        <RuntimeDependencies>
-            <Dependency release="current">kaddressbook</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="header">/usr/include</Path>
-            <Path fileType="library">/usr/lib/pkgconfig</Path>
-            <Path fileType="data">/usr/lib/cmake</Path>
-        </Files>
-        <Replaces>
-            <Package>kaddressbook-kf6-devel</Package>
-        </Replaces>
-    </Package>
-
-    <History>
-        <Update release="55">
-            <Date>2025-05-08</Date>
-            <Version>25.04.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="54">
-            <Date>2025-04-20</Date>
-            <Version>25.04.0</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="53">
-            <Date>2025-04-02</Date>
-            <Version>24.12.3</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="52">
-            <Date>2025-02-06</Date>
-            <Version>24.12.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="51">
-            <Date>2025-01-09</Date>
-            <Version>24.12.1</Version>
-            <Comment>First release</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-    </History>
+  <Source>
+    <Name>kaddressbook</Name>
+    <Homepage>https://kontact.kde.org/</Homepage>
+    <Packager>
+      <Name>Stefan Gronewold</Name>
+      <Email>groni@pisilinux.org</Email>
+    </Packager>
+    <License>GPLv2</License>
+    <Summary>KDE contact manager</Summary>
+    <Description>kaddressbook reborn to make your data available to all your applications</Description>
+    <Archive sha1sum="88b56baf37721d66d64332e30844cf740d0f7b61" type="tarxz">mirrors://kde/stable/release-service/25.04.2/src/kaddressbook-25.04.2.tar.xz</Archive>
+    <BuildDependencies>
+      <Dependency>kparts-devel</Dependency>
+      <Dependency>kcrash-devel</Dependency>
+      <Dependency>prison-devel</Dependency>
+      <Dependency>kcmutils-devel</Dependency>
+      <Dependency>qt6-base-devel</Dependency>
+      <Dependency>kdoctools-devel</Dependency>
+      <Dependency>cyrus-sasl-devel</Dependency>
+      <Dependency>kdbusaddons-devel</Dependency>
+      <Dependency>kitemmodels-devel</Dependency>
+      <Dependency>extra-cmake-modules</Dependency>
+      <Dependency>kuserfeedback-devel</Dependency>
+      <Dependency>kunitconversion-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kimap-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kldap-devel</Dependency>
+      <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkleo-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkdepim-devel</Dependency>
+      <Dependency versionFrom="25.04.2">pimcommon-devel</Dependency>
+      <Dependency versionFrom="1.7.1">qgpgme-qt6-devel</Dependency>
+      <Dependency versionFrom="25.04.2">mailcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">messagelib-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-mime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kpimtextedit-devel</Dependency>
+      <Dependency versionFrom="25.04.2">grantleetheme-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-search-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kontactinterface-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-contacts-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kidentitymanagement-devel</Dependency>
+    </BuildDependencies>
+  </Source>
+  <Package>
+    <Name>kaddressbook</Name>
+    <Summary>KDE contact manager</Summary>
+    <RuntimeDependencies>
+      <Dependency>ki18n</Dependency>
+      <Dependency>kldap</Dependency>
+      <Dependency>kcrash</Dependency>
+      <Dependency>kparts</Dependency>
+      <Dependency>libgcc</Dependency>
+      <Dependency>akonadi</Dependency>
+      <Dependency>kconfig</Dependency>
+      <Dependency>kxmlgui</Dependency>
+      <Dependency>kcmutils</Dependency>
+      <Dependency>qt6-base</Dependency>
+      <Dependency>kcontacts</Dependency>
+      <Dependency>libkdepim</Dependency>
+      <Dependency>pimcommon</Dependency>
+      <Dependency>kcompletion</Dependency>
+      <Dependency>kcoreaddons</Dependency>
+      <Dependency>kiconthemes</Dependency>
+      <Dependency>kitemmodels</Dependency>
+      <Dependency>grantleetheme</Dependency>
+      <Dependency>akonadi-search</Dependency>
+      <Dependency>kconfigwidgets</Dependency>
+      <Dependency>kwidgetsaddons</Dependency>
+      <Dependency>akonadi-contacts</Dependency>
+      <Dependency>kontactinterface</Dependency>
+    </RuntimeDependencies>
+    <Files>
+      <Path fileType="config">/etc/xdg</Path>
+      <Path fileType="executable">/usr/bin</Path>
+      <Path fileType="library">/usr/lib</Path>
+      <Path fileType="data">/usr/share</Path>
+      <Path fileType="doc">/usr/share/doc</Path>
+    </Files>
+    <Replaces>
+      <Package>kaddressbook-kf6</Package>
+    </Replaces>
+  </Package>
+  <Package>
+    <Name>kaddressbook-devel</Name>
+    <Summary>Development files for kaddressbook</Summary>
+    <RuntimeDependencies>
+      <Dependency release="current">kaddressbook</Dependency>
+    </RuntimeDependencies>
+    <Files>
+      <Path fileType="header">/usr/include</Path>
+      <Path fileType="library">/usr/lib/pkgconfig</Path>
+      <Path fileType="data">/usr/lib/cmake</Path>
+    </Files>
+    <Replaces>
+      <Package>kaddressbook-kf6-devel</Package>
+    </Replaces>
+  </Package>
+  <History>
+    <Update release="56">
+      <Date>2025-06-08</Date>
+      <Version>25.04.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="55">
+      <Date>2025-05-08</Date>
+      <Version>25.04.1</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="54">
+      <Date>2025-04-20</Date>
+      <Version>25.04.0</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="53">
+      <Date>2025-04-02</Date>
+      <Version>24.12.3</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="52">
+      <Date>2025-02-06</Date>
+      <Version>24.12.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="51">
+      <Date>2025-01-09</Date>
+      <Version>24.12.1</Version>
+      <Comment>First release</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+  </History>
 </PISI>
diff --git a/desktop/kde/applications/kalarm/pspec.xml b/desktop/kde/applications/kalarm/pspec.xml
index 46177b4ccc..ba73ad7adf 100755
--- a/desktop/kde/applications/kalarm/pspec.xml
+++ b/desktop/kde/applications/kalarm/pspec.xml
@@ -1,169 +1,174 @@
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
-    <Source>
-        <Name>kalarm</Name>
-        <Homepage>https://community.kde.org/KDE_PIM</Homepage>
-        <Packager>
-            <Name>Stefan Gronewold</Name>
-            <Email>groni@pisilinux.org</Email>
-        </Packager>
-        <License>GPLv2</License>
-        <Summary>Personal alarm scheduler</Summary>
-        <Description>kalarm is a personal alarm message, audio, command and email scheduler</Description>
-        <Archive type="tarxz" sha1sum="52daaaf62bd7ba55b64fc4534452f2e39fc1ef33">http://download.kde.org/stable/release-service/25.04.1/src/kalarm-25.04.1.tar.xz</Archive>
-        <BuildDependencies>
-            <Dependency versionFrom="25.04.1">akonadi-contacts-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-mime-devel</Dependency>
-            <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>kauth-devel</Dependency>
-            <Dependency>vlc-libs</Dependency>
-            <Dependency>vlc-devel</Dependency>
-            <Dependency>mpv-player-devel</Dependency>
-            <Dependency>kcalendarcore-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kcalutils-devel</Dependency>
-            <Dependency>kcmutils-devel</Dependency>
-            <Dependency>kcodecs-devel</Dependency>
-            <Dependency>kcompletion-devel</Dependency>
-            <Dependency>kconfig-devel</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kdbusaddons-devel</Dependency>
-            <Dependency>kglobalaccel-devel</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency>kguiaddons-devel</Dependency>
-            <Dependency>kholidays-devel</Dependency>
-            <Dependency>ki18n-devel</Dependency>
-            <Dependency>kiconthemes-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kidentitymanagement-devel</Dependency>
-            <Dependency>kio-devel</Dependency>
-            <Dependency>kjobwidgets-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kmime-devel</Dependency>
-            <Dependency>knotifications-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kpimtextedit-devel</Dependency>
-            <Dependency>kservice-devel</Dependency>
-            <Dependency>kwidgetsaddons-devel</Dependency>
-            <Dependency>kwindowsystem-devel</Dependency>
-            <Dependency>kxmlgui-devel</Dependency>
-            <Dependency>libX11-devel</Dependency>
-            <Dependency versionFrom="25.04.1">libkdepim-devel</Dependency>
-            <Dependency>libxslt-devel</Dependency>
-            <Dependency versionFrom="25.04.1">mailcommon-devel</Dependency>
-            <Dependency versionFrom="25.04.1">pimcommon-devel</Dependency>
-            <Dependency>qt6-base-devel</Dependency>
-            <Dependency>qt6-5compat-devel</Dependency>
-            <Dependency>qt6-phonon-devel</Dependency>
-            <Dependency>kunitconversion-devel</Dependency>
-            <Dependency>kitemmodels-devel</Dependency>
-            <Dependency>kcontacts-devel</Dependency>
-            <Dependency versionFrom="25.04.1">messagelib-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kimap-devel</Dependency>
-            <Dependency>cyrus-sasl-devel</Dependency>
-            <Dependency versionFrom="25.04.1">libkleo-devel</Dependency>
-            <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kmailtransport-devel</Dependency>
-            <Dependency>libcanberra-devel</Dependency>
-            <Dependency>kidletime-devel</Dependency>
-            <Dependency>knotifyconfig-devel</Dependency>
-            <Dependency>kstatusnotifieritem-devel</Dependency>
-        </BuildDependencies>
-    </Source>
-
-    <Package>
-        <Name>kalarm</Name>
-        <Summary>Personal alarm scheduler</Summary>
-        <RuntimeDependencies>
-            <Dependency>kio</Dependency>
-            <Dependency>kauth</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kmime</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>vlc-libs</Dependency>
-            <Dependency>akonadi</Dependency>
-            <Dependency>kcodecs</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>mpv-player</Dependency>
-            <Dependency>kcalendarcore</Dependency>
-            <Dependency>kservice</Dependency>
-            <Dependency>kcalutils</Dependency>
-            <Dependency>kcontacts</Dependency>
-            <Dependency>kholidays</Dependency>
-            <Dependency>libkdepim</Dependency>
-            <Dependency>pimcommon</Dependency>
-            <Dependency>kguiaddons</Dependency>
-            <Dependency>qt6-5compat</Dependency>
-            <Dependency>qt6-phonon</Dependency>
-            <Dependency>kcompletion</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kdbusaddons</Dependency>
-            <Dependency>kiconthemes</Dependency>
-            <Dependency>kitemmodels</Dependency>
-            <Dependency>kjobwidgets</Dependency>
-            <Dependency>akonadi-mime</Dependency>
-            <Dependency>kpimtextedit</Dependency>
-            <Dependency>ktextwidgets</Dependency>
-            <Dependency>kwindowsystem</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kmailtransport</Dependency>
-            <Dependency>knotifications</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>akonadi-contacts</Dependency>
-            <Dependency>kglobalaccel</Dependency>
-            <Dependency>kidentitymanagement</Dependency>
-            <Dependency>qt6-base</Dependency>
-            <Dependency>kidletime</Dependency>
-            <Dependency>knotifyconfig</Dependency>
-            <Dependency>kstatusnotifieritem</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="config">/etc/dbus-1</Path>
-            <Path fileType="config">/etc/xdg</Path>
-            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="data">/usr/share</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-        </Files>
-        <Replaces>
-            <Package>kalarm-kf6</Package>
-        </Replaces>
-    </Package>
-
-    <History>
-        <Update release="54">
-            <Date>2025-05-08</Date>
-            <Version>25.04.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="53">
-            <Date>2025-04-20</Date>
-            <Version>25.04.0</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="52">
-            <Date>2025-04-02</Date>
-            <Version>24.12.3</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="51">
-            <Date>2025-02-06</Date>
-            <Version>24.12.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="50">
-            <Date>2025-01-09</Date>
-            <Version>24.12.1</Version>
-            <Comment>First release</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-    </History>
+  <Source>
+    <Name>kalarm</Name>
+    <Homepage>https://community.kde.org/KDE_PIM</Homepage>
+    <Packager>
+      <Name>Stefan Gronewold</Name>
+      <Email>groni@pisilinux.org</Email>
+    </Packager>
+    <License>GPLv2</License>
+    <Summary>Personal alarm scheduler</Summary>
+    <Description>kalarm is a personal alarm message, audio, command and email scheduler</Description>
+    <Archive type="tarxz" sha1sum="71f5d7fabffaa93363766a6694425e138ff2bd6b">http://download.kde.org/stable/release-service/25.04.2/src/kalarm-25.04.2.tar.xz</Archive>
+    <BuildDependencies>
+      <Dependency>vlc-libs</Dependency>
+      <Dependency>vlc-devel</Dependency>
+      <Dependency>kio-devel</Dependency>
+      <Dependency>kauth-devel</Dependency>
+      <Dependency>ki18n-devel</Dependency>
+      <Dependency>libX11-devel</Dependency>
+      <Dependency>kcodecs-devel</Dependency>
+      <Dependency>kconfig-devel</Dependency>
+      <Dependency>kxmlgui-devel</Dependency>
+      <Dependency>libxslt-devel</Dependency>
+      <Dependency>kcmutils-devel</Dependency>
+      <Dependency>kconfigwidgets</Dependency>
+      <Dependency>kservice-devel</Dependency>
+      <Dependency>qt6-base-devel</Dependency>
+      <Dependency>kdoctools-devel</Dependency>
+      <Dependency>kholidays-devel</Dependency>
+      <Dependency>kcontacts-devel</Dependency>
+      <Dependency>kidletime-devel</Dependency>
+      <Dependency>mpv-player-devel</Dependency>
+      <Dependency>kguiaddons-devel</Dependency>
+      <Dependency>qt6-phonon-devel</Dependency>
+      <Dependency>cyrus-sasl-devel</Dependency>
+      <Dependency>kcompletion-devel</Dependency>
+      <Dependency>kdbusaddons-devel</Dependency>
+      <Dependency>kiconthemes-devel</Dependency>
+      <Dependency>kjobwidgets-devel</Dependency>
+      <Dependency>qt6-5compat-devel</Dependency>
+      <Dependency>kitemmodels-devel</Dependency>
+      <Dependency>libcanberra-devel</Dependency>
+      <Dependency>kglobalaccel-devel</Dependency>
+      <Dependency>extra-cmake-modules</Dependency>
+      <Dependency>kcalendarcore-devel</Dependency>
+      <Dependency>kwindowsystem-devel</Dependency>
+      <Dependency>knotifyconfig-devel</Dependency>
+      <Dependency>knotifications-devel</Dependency>
+      <Dependency>kwidgetsaddons-devel</Dependency>
+      <Dependency>kunitconversion-devel</Dependency>
+      <Dependency>kstatusnotifieritem-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kimap-devel</Dependency>
+      <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkleo-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kcalutils-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkdepim-devel</Dependency>
+      <Dependency versionFrom="25.04.2">pimcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">mailcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">messagelib-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-mime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kpimtextedit-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmailtransport-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-contacts-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kidentitymanagement-devel</Dependency>
+    </BuildDependencies>
+  </Source>
+  <Package>
+    <Name>kalarm</Name>
+    <Summary>Personal alarm scheduler</Summary>
+    <RuntimeDependencies>
+      <Dependency>kio</Dependency>
+      <Dependency>kauth</Dependency>
+      <Dependency>ki18n</Dependency>
+      <Dependency>kmime</Dependency>
+      <Dependency>libgcc</Dependency>
+      <Dependency>akonadi</Dependency>
+      <Dependency>kcodecs</Dependency>
+      <Dependency>kconfig</Dependency>
+      <Dependency>kxmlgui</Dependency>
+      <Dependency>vlc-libs</Dependency>
+      <Dependency>kservice</Dependency>
+      <Dependency>qt6-base</Dependency>
+      <Dependency>kcalutils</Dependency>
+      <Dependency>kcontacts</Dependency>
+      <Dependency>kholidays</Dependency>
+      <Dependency>libkdepim</Dependency>
+      <Dependency>pimcommon</Dependency>
+      <Dependency>kidletime</Dependency>
+      <Dependency>mpv-player</Dependency>
+      <Dependency>kguiaddons</Dependency>
+      <Dependency>qt6-phonon</Dependency>
+      <Dependency>qt6-5compat</Dependency>
+      <Dependency>kcompletion</Dependency>
+      <Dependency>kcoreaddons</Dependency>
+      <Dependency>kdbusaddons</Dependency>
+      <Dependency>kiconthemes</Dependency>
+      <Dependency>kitemmodels</Dependency>
+      <Dependency>kjobwidgets</Dependency>
+      <Dependency>akonadi-mime</Dependency>
+      <Dependency>kpimtextedit</Dependency>
+      <Dependency>ktextwidgets</Dependency>
+      <Dependency>kglobalaccel</Dependency>
+      <Dependency>kcalendarcore</Dependency>
+      <Dependency>kwindowsystem</Dependency>
+      <Dependency>knotifyconfig</Dependency>
+      <Dependency>kconfigwidgets</Dependency>
+      <Dependency>kmailtransport</Dependency>
+      <Dependency>knotifications</Dependency>
+      <Dependency>kwidgetsaddons</Dependency>
+      <Dependency>akonadi-contacts</Dependency>
+      <Dependency>kidentitymanagement</Dependency>
+      <Dependency>kstatusnotifieritem</Dependency>
+    </RuntimeDependencies>
+    <Files>
+      <Path fileType="config">/etc/dbus-1</Path>
+      <Path fileType="config">/etc/xdg</Path>
+      <Path fileType="library">/usr/lib</Path>
+      <Path fileType="executable">/usr/bin</Path>
+      <Path fileType="data">/usr/share</Path>
+      <Path fileType="doc">/usr/share/doc</Path>
+    </Files>
+    <Replaces>
+      <Package>kalarm-kf6</Package>
+    </Replaces>
+  </Package>
+  <History>
+    <Update release="55">
+      <Date>2025-06-08</Date>
+      <Version>25.04.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="54">
+      <Date>2025-05-08</Date>
+      <Version>25.04.1</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="53">
+      <Date>2025-04-20</Date>
+      <Version>25.04.0</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="52">
+      <Date>2025-04-02</Date>
+      <Version>24.12.3</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="51">
+      <Date>2025-02-06</Date>
+      <Version>24.12.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="50">
+      <Date>2025-01-09</Date>
+      <Version>24.12.1</Version>
+      <Comment>First release</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+  </History>
 </PISI>
diff --git a/desktop/kde/applications/kmail-account-wizard/pspec.xml b/desktop/kde/applications/kmail-account-wizard/pspec.xml
index 5d7a17bd74..f606c9fdf5 100755
--- a/desktop/kde/applications/kmail-account-wizard/pspec.xml
+++ b/desktop/kde/applications/kmail-account-wizard/pspec.xml
@@ -1,127 +1,133 @@
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
-    <Source>
-        <Name>kmail-account-wizard</Name>
-        <Homepage>https://community.kde.org/KDE_PIM</Homepage>
-        <Packager>
-            <Name>Stefan Gronewold</Name>
-            <Email>groni@pisilinux.org</Email>
-        </Packager>
-        <License>GPLv2</License>
-        <Summary>kmail Account Wizard</Summary>
-        <Description>kmail Account Wizard</Description>
-        <Archive sha1sum="0c7a3803cee9b77649e76c1aa5e47534ff91b16e" type="tarxz">mirrors://kde/stable/release-service/25.04.1/src/kmail-account-wizard-25.04.1.tar.xz</Archive>
-        <BuildDependencies>
-            <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
-            <Dependency versionFrom="1.7.1">gpgme-qt6-devel</Dependency>
-             <Dependency>extra-cmake-modules</Dependency>
-             <Dependency>kcmutils-devel</Dependency>
-             <Dependency>kcrash-devel</Dependency>
-             <Dependency>kdbusaddons-devel</Dependency>
-             <Dependency>kdoctools-devel</Dependency>
-             <Dependency>prison-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-search-devel</Dependency>
-             <Dependency versionFrom="25.04.1">grantleetheme-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kpimtextedit-devel</Dependency>
-             <Dependency versionFrom="25.04.1">libkdepim-devel</Dependency>
-             <Dependency versionFrom="25.04.1">libkleo-devel</Dependency>
-             <Dependency versionFrom="25.04.1">pimcommon-devel</Dependency>
-             <Dependency>qt6-base-devel</Dependency>
-             <Dependency>knotifyconfig-devel</Dependency>
-             <Dependency>ktexteditor-devel</Dependency>
-             <Dependency>kitemmodels-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-contacts-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kidentitymanagement-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kldap-devel</Dependency>
-             <Dependency>cyrus-sasl-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kmailtransport-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-mime-devel</Dependency>
-             <Dependency versionFrom="25.04.1">mailcommon-devel</Dependency>
-             <Dependency versionFrom="25.04.1">messagelib-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kimap-devel</Dependency>
-             <Dependency>knewstuff-devel</Dependency>
-            <Dependency>knotifications-devel</Dependency>
-        </BuildDependencies>
-    </Source>
-    <Package>
-        <Name>kmail-account-wizard</Name>
-        <Summary>kmail Account Wizard</Summary>
-        <RuntimeDependencies>
-            <Dependency>kio</Dependency>
-            <Dependency versionFrom="1.7.1">gpgme</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kldap</Dependency>
-            <Dependency>kmime</Dependency>
-            <Dependency>kcrash</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>akonadi</Dependency>
-            <Dependency>kcodecs</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kwallet</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>libkleo</Dependency>
-            <Dependency>kcmutils</Dependency>
-            <Dependency>qt6-base</Dependency>
-            <Dependency>knewstuff</Dependency>
-            <Dependency>libkdepim</Dependency>
-            <Dependency>kitemviews</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kdbusaddons</Dependency>
-            <Dependency>akonadi-mime</Dependency>
-            <Dependency>kmailtransport</Dependency>
-            <Dependency>knotifications</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>kidentitymanagement</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="config">/etc/xdg</Path>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="data">/usr/share</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-        </Files>
-        <Replaces>
-            <Package>kmail-account-wizard-kf6</Package>
-        </Replaces>
-    </Package>
-
-    <History>
-        <Update release="53">
-            <Date>2025-05-08</Date>
-            <Version>25.04.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="52">
-            <Date>2025-04-20</Date>
-            <Version>25.04.0</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="51">
-            <Date>2025-04-02</Date>
-            <Version>24.12.3</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="50">
-            <Date>2025-02-06</Date>
-            <Version>24.12.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="49">
-            <Date>2025-01-09</Date>
-            <Version>24.12.1</Version>
-            <Comment>First release</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-    </History>
+  <Source>
+    <Name>kmail-account-wizard</Name>
+    <Homepage>https://community.kde.org/KDE_PIM</Homepage>
+    <Packager>
+      <Name>Stefan Gronewold</Name>
+      <Email>groni@pisilinux.org</Email>
+    </Packager>
+    <License>GPLv2</License>
+    <Summary>kmail Account Wizard</Summary>
+    <Description>kmail Account Wizard</Description>
+    <Archive sha1sum="1d658582062ba802bf71465c41e1383a61c2b5d1" type="tarxz">mirrors://kde/stable/release-service/25.04.2/src/kmail-account-wizard-25.04.2.tar.xz</Archive>
+    <BuildDependencies>
+      <Dependency>kcrash-devel</Dependency>
+      <Dependency>prison-devel</Dependency>
+      <Dependency>kcmutils-devel</Dependency>
+      <Dependency>qt6-base-devel</Dependency>
+      <Dependency>kdoctools-devel</Dependency>
+      <Dependency>knewstuff-devel</Dependency>
+      <Dependency>cyrus-sasl-devel</Dependency>
+      <Dependency>kdbusaddons-devel</Dependency>
+      <Dependency>ktexteditor-devel</Dependency>
+      <Dependency>kitemmodels-devel</Dependency>
+      <Dependency>extra-cmake-modules</Dependency>
+      <Dependency>knotifyconfig-devel</Dependency>
+      <Dependency>knotifications-devel</Dependency>
+      <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kldap-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kimap-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkleo-devel</Dependency>
+      <Dependency versionFrom="1.7.1">qgpgme-qt6-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkdepim-devel</Dependency>
+      <Dependency versionFrom="25.04.2">pimcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">mailcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">messagelib-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kpimtextedit-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-mime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">grantleetheme-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-search-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmailtransport-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-contacts-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kidentitymanagement-devel</Dependency>
+    </BuildDependencies>
+  </Source>
+  <Package>
+    <Name>kmail-account-wizard</Name>
+    <Summary>kmail Account Wizard</Summary>
+    <RuntimeDependencies>
+      <Dependency>kio</Dependency>
+      <Dependency>ki18n</Dependency>
+      <Dependency>kldap</Dependency>
+      <Dependency>kmime</Dependency>
+      <Dependency>kcrash</Dependency>
+      <Dependency>libgcc</Dependency>
+      <Dependency>akonadi</Dependency>
+      <Dependency>kcodecs</Dependency>
+      <Dependency>kconfig</Dependency>
+      <Dependency>kwallet</Dependency>
+      <Dependency>kxmlgui</Dependency>
+      <Dependency>libkleo</Dependency>
+      <Dependency>kcmutils</Dependency>
+      <Dependency>qt6-base</Dependency>
+      <Dependency>knewstuff</Dependency>
+      <Dependency>libkdepim</Dependency>
+      <Dependency>kitemviews</Dependency>
+      <Dependency>kcoreaddons</Dependency>
+      <Dependency>kdbusaddons</Dependency>
+      <Dependency>akonadi-mime</Dependency>
+      <Dependency>kmailtransport</Dependency>
+      <Dependency>knotifications</Dependency>
+      <Dependency>kwidgetsaddons</Dependency>
+      <Dependency>kidentitymanagement</Dependency>
+      <Dependency versionFrom="1.7.1">gpgme</Dependency>
+    </RuntimeDependencies>
+    <Files>
+      <Path fileType="config">/etc/xdg</Path>
+      <Path fileType="executable">/usr/bin</Path>
+      <Path fileType="library">/usr/lib</Path>
+      <Path fileType="data">/usr/share</Path>
+      <Path fileType="doc">/usr/share/doc</Path>
+    </Files>
+    <Replaces>
+      <Package>kmail-account-wizard-kf6</Package>
+    </Replaces>
+  </Package>
+  <History>
+    <Update release="54">
+      <Date>2025-06-08</Date>
+      <Version>25.04.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="53">
+      <Date>2025-05-08</Date>
+      <Version>25.04.1</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="52">
+      <Date>2025-04-20</Date>
+      <Version>25.04.0</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="51">
+      <Date>2025-04-02</Date>
+      <Version>24.12.3</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="50">
+      <Date>2025-02-06</Date>
+      <Version>24.12.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="49">
+      <Date>2025-01-09</Date>
+      <Version>24.12.1</Version>
+      <Comment>First release</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+  </History>
 </PISI>
diff --git a/desktop/kde/applications/kmail/pspec.xml b/desktop/kde/applications/kmail/pspec.xml
index afc5df68ec..b30ad6a892 100644
--- a/desktop/kde/applications/kmail/pspec.xml
+++ b/desktop/kde/applications/kmail/pspec.xml
@@ -1,190 +1,195 @@
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
-    <Source>
-        <Name>kmail</Name>
-        <Homepage>https://community.kde.org/KDE_PIM</Homepage>
-        <Packager>
-            <Name>Stefan Gronewold</Name>
-            <Email>groni@pisilinux.org</Email>
-        </Packager>
-        <License>GPLv2</License>
-        <Summary>KDE mail client</Summary>
-        <Description>kmail is the email component of kontact, the integrated personal information manager from KDE.</Description>
-        <Archive sha1sum="b607b5756f9d475759b8a0fcb861a00252c25835" type="tarxz">https://download.kde.org/stable/release-service/25.04.1/src/kmail-25.04.1.tar.xz</Archive>
-        <BuildDependencies>
-            <Dependency >gpgme-devel</Dependency>
-             <Dependency>extra-cmake-modules</Dependency>
-             <Dependency>kbookmarks-devel</Dependency>
-             <Dependency>kcmutils-devel</Dependency>
-             <Dependency>kcodecs-devel</Dependency>
-             <Dependency>kconfig-devel</Dependency>
-             <Dependency>kconfigwidgets-devel</Dependency>
-             <Dependency>kcrash-devel</Dependency>
-             <Dependency>kdbusaddons-devel</Dependency>
-             <Dependency>kdoctools-devel</Dependency>
-             <Dependency>kguiaddons-devel</Dependency>
-             <Dependency>ki18n-devel</Dependency>
-             <Dependency>kio-devel</Dependency>
-             <Dependency>kitemviews-devel</Dependency>
-             <Dependency>kjobwidgets-devel</Dependency>
-             <Dependency>knotifications-devel</Dependency>
-             <Dependency>knotifyconfig-devel</Dependency>
-             <Dependency>kparts-devel</Dependency>
-             <Dependency>kservice-devel</Dependency>
-             <Dependency>ktextwidgets-devel</Dependency>
-             <Dependency>kwidgetsaddons-devel</Dependency>
-             <Dependency>kwindowsystem-devel</Dependency>
-             <Dependency>kxmlgui-devel</Dependency>
-             <Dependency>sonnet-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-contacts-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-mime-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-search-devel</Dependency>
-             <Dependency>kcalendarcore-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kcalutils-devel</Dependency>
-             <Dependency>kcontacts-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kidentitymanagement-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kldap-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kmailtransport-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kmime-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kpimtextedit-devel</Dependency>
-             <Dependency versionFrom="25.04.1">ktnef-devel</Dependency>
-             <Dependency>libgravatar</Dependency>
-<!--              <Dependency>libkdepim</Dependency> -->
-             <Dependency versionFrom="25.04.1">libkleo-devel</Dependency>
-             <Dependency versionFrom="25.04.1">messagelib-devel</Dependency>
-             <Dependency versionFrom="25.04.1">pimcommon-devel</Dependency>
-             <Dependency>qt6-base-devel</Dependency>
-             <Dependency>qt6-webengine-devel</Dependency>
-             <Dependency>kitemmodels-devel</Dependency>
-            <Dependency>kstatusnotifieritem-devel</Dependency>
-
-             <Dependency>kunitconversion-devel</Dependency>
-             <Dependency>cyrus-sasl-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kontactinterface-devel</Dependency>
-             <Dependency versionFrom="25.04.1">libksieve-devel</Dependency>
-             <Dependency versionFrom="25.04.1">mailcommon-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kimap-devel</Dependency>
-             <Dependency versionFrom="25.04.1">libgravatar-devel</Dependency>
-             <Dependency versionFrom="25.04.1">libkdepim-devel</Dependency>
-             <Dependency>syntax-highlighting-devel</Dependency>
-             <Dependency versionFrom="1.7.1">gpgme-qt6-devel</Dependency>
-             <Dependency>ffmpeg-devel</Dependency>
-             <Dependency>libXScrnSaver-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-calendar-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-import-wizard-devel</Dependency>
-             <Dependency>qt6-keychain-devel</Dependency>
-             <Dependency>kuserfeedback-devel</Dependency>
-        </BuildDependencies>
-    </Source>
-
-    <Package>
-        <Name>kmail</Name>
-        <Summary>KDE mail client</Summary>
-        <RuntimeDependencies>
-            <Dependency>kio</Dependency>
-            <Dependency versionFrom="1.7.1">gpgme</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kmime</Dependency>
-            <Dependency>ktnef</Dependency>
-            <Dependency>kcrash</Dependency>
-            <Dependency>kparts</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>sonnet</Dependency>
-            <Dependency>akonadi</Dependency>
-            <Dependency>kcodecs</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>libkleo</Dependency>
-            <Dependency>kcalendarcore</Dependency>
-            <Dependency>kcmutils</Dependency>
-            <Dependency>kservice</Dependency>
-            <Dependency>qt6-base</Dependency>
-            <Dependency>kcalutils</Dependency>
-            <Dependency>kcontacts</Dependency>
-            <Dependency>libkdepim</Dependency>
-            <Dependency>libksieve</Dependency>
-            <Dependency>pimcommon</Dependency>
-            <Dependency>kbookmarks</Dependency>
-            <Dependency>kguiaddons</Dependency>
-            <Dependency>kitemviews</Dependency>
-            <Dependency>mailcommon</Dependency>
-            <Dependency>messagelib</Dependency>
-            <Dependency>kcompletion</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kdbusaddons</Dependency>
-            <Dependency>kiconthemes</Dependency>
-            <Dependency>kitemmodels</Dependency>
-            <Dependency>kjobwidgets</Dependency>
-            <Dependency>libgravatar</Dependency>
-            <Dependency>akonadi-mime</Dependency>
-            <Dependency>kpimtextedit</Dependency>
-            <Dependency>ktextwidgets</Dependency>
-            <Dependency>knotifyconfig</Dependency>
-            <Dependency>kwindowsystem</Dependency>
-            <Dependency>akonadi-search</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kmailtransport</Dependency>
-            <Dependency>knotifications</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>akonadi-contacts</Dependency>
-            <Dependency>kontactinterface</Dependency>
-            <Dependency>akonadi-calendar</Dependency>
-            <Dependency>kidentitymanagement</Dependency>
-            <Dependency>kmail-account-wizard</Dependency>
-            <Dependency>akonadi-import-wizard</Dependency>
-            <Dependency>qt6-keychain</Dependency>
-            <Dependency>kstatusnotifieritem</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="config">/etc/xdg</Path>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="library">/usr/lib/qt6</Path>
-            <Path fileType="data">/usr/share</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-        </Files>
-        <Replaces>
-            <Package>kmail-kf6</Package>
-        </Replaces>
-    </Package>
-
-    <History>
-        <Update release="54">
-            <Date>2025-05-08</Date>
-            <Version>25.04.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="53">
-            <Date>2025-04-20</Date>
-            <Version>25.04.0</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="52">
-            <Date>2025-04-02</Date>
-            <Version>24.12.3</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="51">
-            <Date>2025-02-06</Date>
-            <Version>24.12.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="50">
-            <Date>2025-01-09</Date>
-            <Version>24.12.1</Version>
-            <Comment>First release</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-    </History>
+  <Source>
+    <Name>kmail</Name>
+    <Homepage>https://community.kde.org/KDE_PIM</Homepage>
+    <Packager>
+      <Name>Stefan Gronewold</Name>
+      <Email>groni@pisilinux.org</Email>
+    </Packager>
+    <License>GPLv2</License>
+    <Summary>KDE mail client</Summary>
+    <Description>kmail is the email component of kontact, the integrated personal information manager from KDE.</Description>
+    <Archive sha1sum="030390904284375d07bdeaa8d90277224173ccb9" type="tarxz">https://download.kde.org/stable/release-service/25.04.2/src/kmail-25.04.2.tar.xz</Archive>
+    <BuildDependencies>
+      <Dependency>kio-devel</Dependency>
+      <Dependency>gpgme-devel</Dependency>
+      <Dependency>ki18n-devel</Dependency>
+      <Dependency>libgravatar</Dependency>
+      <Dependency>kcrash-devel</Dependency>
+      <Dependency>kparts-devel</Dependency>
+      <Dependency>sonnet-devel</Dependency>
+      <Dependency>ffmpeg-devel</Dependency>
+      <Dependency>kcodecs-devel</Dependency>
+      <Dependency>gpgmepp-devel</Dependency>
+      <Dependency>kconfig-devel</Dependency>
+      <Dependency>kxmlgui-devel</Dependency>
+      <Dependency>kcmutils-devel</Dependency>
+      <Dependency>kservice-devel</Dependency>
+      <Dependency>qt6-base-devel</Dependency>
+      <Dependency>kdoctools-devel</Dependency>
+      <Dependency>kcontacts-devel</Dependency>
+      <Dependency>kbookmarks-devel</Dependency>
+      <Dependency>kguiaddons-devel</Dependency>
+      <Dependency>kitemviews-devel</Dependency>
+      <Dependency>cyrus-sasl-devel</Dependency>
+      <Dependency>kdbusaddons-devel</Dependency>
+      <Dependency>kjobwidgets-devel</Dependency>
+      <Dependency>kitemmodels-devel</Dependency>
+      <Dependency>ktextwidgets-devel</Dependency>
+      <Dependency>qt6-keychain-devel</Dependency>
+      <Dependency>extra-cmake-modules</Dependency>
+      <Dependency>knotifyconfig-devel</Dependency>
+      <Dependency>kwindowsystem-devel</Dependency>
+      <Dependency>kcalendarcore-devel</Dependency>
+      <Dependency>qt6-webengine-devel</Dependency>
+      <Dependency>libXScrnSaver-devel</Dependency>
+      <Dependency>kuserfeedback-devel</Dependency>
+      <Dependency>kconfigwidgets-devel</Dependency>
+      <Dependency>knotifications-devel</Dependency>
+      <Dependency>kwidgetsaddons-devel</Dependency>
+      <Dependency>kunitconversion-devel</Dependency>
+      <Dependency>kstatusnotifieritem-devel</Dependency>
+      <Dependency>syntax-highlighting-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kldap-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">ktnef-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kimap-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkleo-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kcalutils-devel</Dependency>
+      <Dependency versionFrom="25.04.2">pimcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libksieve-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkdepim-devel</Dependency>
+      <Dependency versionFrom="1.7.1">qgpgme-qt6-devel</Dependency>
+      <Dependency versionFrom="25.04.2">messagelib-devel</Dependency>
+      <Dependency versionFrom="25.04.2">mailcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libgravatar-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-mime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kpimtextedit-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-search-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmailtransport-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-contacts-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kontactinterface-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-calendar-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kidentitymanagement-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-import-wizard-devel</Dependency>
+    </BuildDependencies>
+  </Source>
+  <Package>
+    <Name>kmail</Name>
+    <Summary>KDE mail client</Summary>
+    <RuntimeDependencies>
+      <Dependency>kio</Dependency>
+      <Dependency>ki18n</Dependency>
+      <Dependency>kmime</Dependency>
+      <Dependency>ktnef</Dependency>
+      <Dependency>kcrash</Dependency>
+      <Dependency>kparts</Dependency>
+      <Dependency>libgcc</Dependency>
+      <Dependency>sonnet</Dependency>
+      <Dependency>akonadi</Dependency>
+      <Dependency>kcodecs</Dependency>
+      <Dependency>gpgmepp</Dependency>
+      <Dependency>kconfig</Dependency>
+      <Dependency>kxmlgui</Dependency>
+      <Dependency>libkleo</Dependency>
+      <Dependency>kcmutils</Dependency>
+      <Dependency>kservice</Dependency>
+      <Dependency>qt6-base</Dependency>
+      <Dependency>kcalutils</Dependency>
+      <Dependency>kcontacts</Dependency>
+      <Dependency>libkdepim</Dependency>
+      <Dependency>libksieve</Dependency>
+      <Dependency>pimcommon</Dependency>
+      <Dependency>kbookmarks</Dependency>
+      <Dependency>kguiaddons</Dependency>
+      <Dependency>kitemviews</Dependency>
+      <Dependency>mailcommon</Dependency>
+      <Dependency>messagelib</Dependency>
+      <Dependency>kcompletion</Dependency>
+      <Dependency>kcoreaddons</Dependency>
+      <Dependency>kdbusaddons</Dependency>
+      <Dependency>kiconthemes</Dependency>
+      <Dependency>kitemmodels</Dependency>
+      <Dependency>kjobwidgets</Dependency>
+      <Dependency>libgravatar</Dependency>
+      <Dependency>akonadi-mime</Dependency>
+      <Dependency>kpimtextedit</Dependency>
+      <Dependency>ktextwidgets</Dependency>
+      <Dependency>qt6-keychain</Dependency>
+      <Dependency>kcalendarcore</Dependency>
+      <Dependency>knotifyconfig</Dependency>
+      <Dependency>kwindowsystem</Dependency>
+      <Dependency>akonadi-search</Dependency>
+      <Dependency>kconfigwidgets</Dependency>
+      <Dependency>kmailtransport</Dependency>
+      <Dependency>knotifications</Dependency>
+      <Dependency>kwidgetsaddons</Dependency>
+      <Dependency>akonadi-contacts</Dependency>
+      <Dependency>kontactinterface</Dependency>
+      <Dependency>akonadi-calendar</Dependency>
+      <Dependency>kidentitymanagement</Dependency>
+      <Dependency>kstatusnotifieritem</Dependency>
+      <Dependency>kmail-account-wizard</Dependency>
+      <Dependency>akonadi-import-wizard</Dependency>
+      <Dependency versionFrom="1.7.1">gpgme</Dependency>
+    </RuntimeDependencies>
+    <Files>
+      <Path fileType="config">/etc/xdg</Path>
+      <Path fileType="executable">/usr/bin</Path>
+      <Path fileType="library">/usr/lib</Path>
+      <Path fileType="library">/usr/lib/qt6</Path>
+      <Path fileType="data">/usr/share</Path>
+      <Path fileType="doc">/usr/share/doc</Path>
+    </Files>
+    <Replaces>
+      <Package>kmail-kf6</Package>
+    </Replaces>
+  </Package>
+  <History>
+    <Update release="55">
+      <Date>2025-06-08</Date>
+      <Version>25.04.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="54">
+      <Date>2025-05-08</Date>
+      <Version>25.04.1</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="53">
+      <Date>2025-04-20</Date>
+      <Version>25.04.0</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="52">
+      <Date>2025-04-02</Date>
+      <Version>24.12.3</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="51">
+      <Date>2025-02-06</Date>
+      <Version>24.12.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="50">
+      <Date>2025-01-09</Date>
+      <Version>24.12.1</Version>
+      <Comment>First release</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+  </History>
 </PISI>
diff --git a/desktop/kde/applications/kontact/pspec.xml b/desktop/kde/applications/kontact/pspec.xml
index 98a7026aed..88f4e2db4a 100755
--- a/desktop/kde/applications/kontact/pspec.xml
+++ b/desktop/kde/applications/kontact/pspec.xml
@@ -1,125 +1,130 @@
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
-    <Source>
-        <Name>kontact</Name>
-        <Homepage>https://community.kde.org/KDE_PIM</Homepage>
-        <Packager>
-            <Name>Stefan Gronewold</Name>
-            <Email>groni@pisilinux.org</Email>
-        </Packager>
-        <License>GPL2</License>
-        <Summary>KDE Personal Information Manager</Summary>
-        <Description>kontact is the integrated Personal Information Manager of KDE, but can be used with other systems as well.
+  <Source>
+    <Name>kontact</Name>
+    <Homepage>https://community.kde.org/KDE_PIM</Homepage>
+    <Packager>
+      <Name>Stefan Gronewold</Name>
+      <Email>groni@pisilinux.org</Email>
+    </Packager>
+    <License>GPL2</License>
+    <Summary>KDE Personal Information Manager</Summary>
+    <Description>kontact is the integrated Personal Information Manager of KDE, but can be used with other systems as well.
 It supports email, address books, calendars, tasks, news feeds and much more.</Description>
-<Archive sha1sum="70d7ae07fe8cc769083af32072deb2114f4d7d79" type="tarxz">http://download.kde.org/stable/release-service/25.04.1/src/kontact-25.04.1.tar.xz</Archive>
-        <BuildDependencies>
-            <Dependency>boost-devel</Dependency>
-            <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kontactinterface-devel</Dependency>
-            <Dependency versionFrom="25.04.1">mailcommon-devel</Dependency>
-            <Dependency>qt6-base-devel</Dependency>
-            <Dependency>qt6-webengine-devel</Dependency>
-            <Dependency>kdbusaddons-devel</Dependency>
-            <Dependency>kcmutils-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kpimtextedit-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-devel</Dependency>
-            <Dependency>kitemmodels-devel</Dependency>
-            <Dependency>kparts-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-mime-devel</Dependency>
-            <Dependency versionFrom="25.04.1">messagelib-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kmime-devel</Dependency>
-            <Dependency versionFrom="25.04.1">pimcommon-devel</Dependency>
-            <Dependency>kcontacts-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-contacts-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kimap-devel</Dependency>
-            <Dependency>cyrus-sasl-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kidentitymanagement-devel</Dependency>
-            <Dependency versionFrom="25.04.1">libkleo-devel</Dependency>
-            <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
-            <Dependency versionFrom="25.04.1">grantleetheme-devel</Dependency>
-            <Dependency versionFrom="25.04.1">libkdepim-devel</Dependency>
-            <Dependency>ffmpeg-devel</Dependency>
-            <Dependency>libXScrnSaver-devel</Dependency>
-            <Dependency>kguiaddons-devel</Dependency>
-        </BuildDependencies>
-    </Source>
-
-    <Package>
-        <Name>kontact</Name>
-        <Summary>KDE Personal Information Manager</Summary>
-        <RuntimeDependencies>
-            <Dependency>kio</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kcrash</Dependency>
-            <Dependency>kparts</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>kcmutils</Dependency>
-            <Dependency>kservice</Dependency>
-            <Dependency>qt6-base</Dependency>
-            <Dependency>libkdepim</Dependency>
-            <Dependency>kguiaddons</Dependency>
-            <Dependency>kcompletion</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kiconthemes</Dependency>
-            <Dependency>grantleetheme</Dependency>
-            <Dependency>kwindowsystem</Dependency>
-            <Dependency>qt6-webengine</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>kontactinterface</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="config">/etc/xdg</Path>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="data">/usr/share</Path>
-            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="library">/usr/lib/qt6</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-        </Files>
-        <Replaces>
-            <Package>kontact-kf6</Package>
-        </Replaces>
-    </Package>
-
-    <History>
-        <Update release="54">
-            <Date>2025-05-08</Date>
-            <Version>25.04.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="53">
-            <Date>2025-04-20</Date>
-            <Version>25.04.0</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="52">
-            <Date>2025-04-02</Date>
-            <Version>24.12.3</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="51">
-            <Date>2025-02-06</Date>
-            <Version>24.12.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="50">
-            <Date>2025-01-09</Date>
-            <Version>24.12.1</Version>
-            <Comment>First release</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-    </History>
+    <Archive sha1sum="7b990b39b000edc6a88f0dd8b5c692be01dc1299" type="tarxz">http://download.kde.org/stable/release-service/25.04.2/src/kontact-25.04.2.tar.xz</Archive>
+    <BuildDependencies>
+      <Dependency>boost-devel</Dependency>
+      <Dependency>kparts-devel</Dependency>
+      <Dependency>ffmpeg-devel</Dependency>
+      <Dependency>qt6-base-devel</Dependency>
+      <Dependency>kcmutils-devel</Dependency>
+      <Dependency>kdoctools-devel</Dependency>
+      <Dependency>kcontacts-devel</Dependency>
+      <Dependency>cyrus-sasl-devel</Dependency>
+      <Dependency>kguiaddons-devel</Dependency>
+      <Dependency>kdbusaddons-devel</Dependency>
+      <Dependency>kitemmodels-devel</Dependency>
+      <Dependency>extra-cmake-modules</Dependency>
+      <Dependency>qt6-webengine-devel</Dependency>
+      <Dependency>libXScrnSaver-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kimap-devel</Dependency>
+      <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkleo-devel</Dependency>
+      <Dependency versionFrom="25.04.2">pimcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkdepim-devel</Dependency>
+      <Dependency versionFrom="25.04.2">mailcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">messagelib-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kpimtextedit-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-mime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">grantleetheme-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kontactinterface-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-contacts-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kidentitymanagement-devel</Dependency>
+    </BuildDependencies>
+  </Source>
+  <Package>
+    <Name>kontact</Name>
+    <Summary>KDE Personal Information Manager</Summary>
+    <RuntimeDependencies>
+      <Dependency>kio</Dependency>
+      <Dependency>ki18n</Dependency>
+      <Dependency>kcrash</Dependency>
+      <Dependency>kparts</Dependency>
+      <Dependency>libgcc</Dependency>
+      <Dependency>kconfig</Dependency>
+      <Dependency>kxmlgui</Dependency>
+      <Dependency>kcmutils</Dependency>
+      <Dependency>kservice</Dependency>
+      <Dependency>qt6-base</Dependency>
+      <Dependency>libkdepim</Dependency>
+      <Dependency>kguiaddons</Dependency>
+      <Dependency>kcompletion</Dependency>
+      <Dependency>kcoreaddons</Dependency>
+      <Dependency>kiconthemes</Dependency>
+      <Dependency>grantleetheme</Dependency>
+      <Dependency>kwindowsystem</Dependency>
+      <Dependency>qt6-webengine</Dependency>
+      <Dependency>kconfigwidgets</Dependency>
+      <Dependency>kwidgetsaddons</Dependency>
+      <Dependency>kontactinterface</Dependency>
+    </RuntimeDependencies>
+    <Files>
+      <Path fileType="config">/etc/xdg</Path>
+      <Path fileType="executable">/usr/bin</Path>
+      <Path fileType="data">/usr/share</Path>
+      <Path fileType="library">/usr/lib</Path>
+      <Path fileType="library">/usr/lib/qt6</Path>
+      <Path fileType="doc">/usr/share/doc</Path>
+    </Files>
+    <Replaces>
+      <Package>kontact-kf6</Package>
+    </Replaces>
+  </Package>
+  <History>
+    <Update release="55">
+      <Date>2025-06-08</Date>
+      <Version>25.04.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="54">
+      <Date>2025-05-08</Date>
+      <Version>25.04.1</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="53">
+      <Date>2025-04-20</Date>
+      <Version>25.04.0</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="52">
+      <Date>2025-04-02</Date>
+      <Version>24.12.3</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="51">
+      <Date>2025-02-06</Date>
+      <Version>24.12.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="50">
+      <Date>2025-01-09</Date>
+      <Version>24.12.1</Version>
+      <Comment>First release</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+  </History>
 </PISI>
diff --git a/desktop/kde/applications/korganizer/pspec.xml b/desktop/kde/applications/korganizer/pspec.xml
index 6ac2a414af..73c10a19ca 100755
--- a/desktop/kde/applications/korganizer/pspec.xml
+++ b/desktop/kde/applications/korganizer/pspec.xml
@@ -1,155 +1,160 @@
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
-    <Source>
-        <Name>korganizer</Name>
-        <Homepage>https://community.kde.org/KDE_PIM</Homepage>
-        <Packager>
-            <Name>Stefan Gronewold</Name>
-            <Email>groni@pisilinux.org</Email>
-        </Packager>
-        <License>GPLv2</License>
-        <Summary>Calendar and scheduling Program</Summary>
-        <Description>korganizer is the calendar and scheduling component of kontact, the integrated personal information manager from KDE.</Description>
-        <Archive sha1sum="8ec5dcdac310db475c34eb657ad42be27760b5b0" type="tarxz">https://download.kde.org/stable/release-service/25.04.1/src/korganizer-25.04.1.tar.xz</Archive>
-        <BuildDependencies>
-            <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
-             <Dependency>extra-cmake-modules</Dependency>
-             <Dependency>kcmutils-devel</Dependency>
-             <Dependency>kcrash-devel</Dependency>
-             <Dependency>kdbusaddons-devel</Dependency>
-             <Dependency>kdoctools-devel</Dependency>
-             <Dependency>prison-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-search-devel</Dependency>
-             <Dependency versionFrom="25.04.1">grantleetheme-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kpimtextedit-devel</Dependency>
-             <Dependency versionFrom="25.04.1">libkdepim-devel</Dependency>
-             <Dependency versionFrom="25.04.1">libkleo-devel</Dependency>
-             <Dependency versionFrom="25.04.1">pimcommon-devel</Dependency>
-             <Dependency>qt6-base-devel</Dependency>
-             <Dependency>kitemmodels-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-mime-devel</Dependency>
-             <Dependency>kunitconversion-devel</Dependency>
-             <Dependency>knewstuff-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-contacts-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kidentitymanagement-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kmailtransport-devel</Dependency>
-             <Dependency>cyrus-sasl-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kcalutils-devel</Dependency>
-             <Dependency>kholidays-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kldap-devel</Dependency>
-             <Dependency versionFrom="25.04.1">akonadi-calendar-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kontactinterface-devel</Dependency>
-             <Dependency versionFrom="25.04.1">mailcommon-devel</Dependency>
-             <Dependency versionFrom="25.04.1">messagelib-devel</Dependency>
-             <Dependency versionFrom="25.04.1">kimap-devel</Dependency>
-             <Dependency versionFrom="25.04.1">incidenceeditor-devel</Dependency>
-             <Dependency versionFrom="25.04.1">eventviews-devel</Dependency>
-             <Dependency versionFrom="25.04.1">calendarsupport-devel</Dependency>
-            <Dependency>kparts-devel</Dependency>
-            <Dependency>kuserfeedback-devel</Dependency>
-            <Dependency>knotifications-devel</Dependency>
-            <Dependency>qt6-phonon-devel</Dependency>
-        </BuildDependencies>
-    </Source>
-
-    <Package>
-        <Name>korganizer</Name>
-        <Summary>Calendar and scheduling Program</Summary>
-        <RuntimeDependencies>
-            <Dependency>kio</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kmime</Dependency>
-            <Dependency>kcrash</Dependency>
-            <Dependency>kparts</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>akonadi</Dependency>
-            <Dependency>kcodecs</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>kcalendarcore</Dependency>
-            <Dependency>kcmutils</Dependency>
-            <Dependency>kservice</Dependency>
-            <Dependency>qt6-base</Dependency>
-            <Dependency>kcalutils</Dependency>
-            <Dependency>kcontacts</Dependency>
-            <Dependency>kholidays</Dependency>
-            <Dependency>knewstuff</Dependency>
-            <Dependency>libkdepim</Dependency>
-            <Dependency>pimcommon</Dependency>
-            <Dependency>eventviews</Dependency>
-            <Dependency>kitemviews</Dependency>
-            <Dependency>mailcommon</Dependency>
-            <Dependency>qt6-phonon</Dependency>
-            <Dependency>kcompletion</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kdbusaddons</Dependency>
-            <Dependency>kiconthemes</Dependency>
-            <Dependency>kitemmodels</Dependency>
-            <Dependency>kjobwidgets</Dependency>
-            <Dependency>akonadi-mime</Dependency>
-            <Dependency>kpimtextedit</Dependency>
-            <Dependency>kwindowsystem</Dependency>
-            <Dependency>akonadi-search</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kmailtransport</Dependency>
-            <Dependency>knotifications</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>calendarsupport</Dependency>
-            <Dependency>incidenceeditor</Dependency>
-            <Dependency>akonadi-calendar</Dependency>
-            <Dependency>akonadi-contacts</Dependency>
-            <Dependency>kontactinterface</Dependency>
-            <Dependency>kidentitymanagement</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="config">/etc/xdg</Path>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="data">/usr/share</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-        </Files>
-        <Replaces>
-            <Package>korganizer-kf6</Package>
-        </Replaces>
-    </Package>
-
-    <History>
-        <Update release="49">
-            <Date>2025-05-08</Date>
-            <Version>25.04.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="48">
-            <Date>2025-04-20</Date>
-            <Version>25.04.0</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="47">
-            <Date>2025-04-02</Date>
-            <Version>24.12.3</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="46">
-            <Date>2025-02-06</Date>
-            <Version>24.12.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="45">
-            <Date>2025-01-09</Date>
-            <Version>24.12.1</Version>
-            <Comment>First release</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-    </History>
+  <Source>
+    <Name>korganizer</Name>
+    <Homepage>https://community.kde.org/KDE_PIM</Homepage>
+    <Packager>
+      <Name>Stefan Gronewold</Name>
+      <Email>groni@pisilinux.org</Email>
+    </Packager>
+    <License>GPLv2</License>
+    <Summary>Calendar and scheduling Program</Summary>
+    <Description>korganizer is the calendar and scheduling component of kontact, the integrated personal information manager from KDE.</Description>
+    <Archive sha1sum="adb507d4ddf50f4cf16ab5ea777fc40d69bfc2bb" type="tarxz">https://download.kde.org/stable/release-service/25.04.2/src/korganizer-25.04.2.tar.xz</Archive>
+    <BuildDependencies>
+      <Dependency>kcrash-devel</Dependency>
+      <Dependency>prison-devel</Dependency>
+      <Dependency>kparts-devel</Dependency>
+      <Dependency>kcmutils-devel</Dependency>
+      <Dependency>qt6-base-devel</Dependency>
+      <Dependency>kdoctools-devel</Dependency>
+      <Dependency>knewstuff-devel</Dependency>
+      <Dependency>kholidays-devel</Dependency>
+      <Dependency>cyrus-sasl-devel</Dependency>
+      <Dependency>qt6-phonon-devel</Dependency>
+      <Dependency>kdbusaddons-devel</Dependency>
+      <Dependency>kitemmodels-devel</Dependency>
+      <Dependency>extra-cmake-modules</Dependency>
+      <Dependency>kuserfeedback-devel</Dependency>
+      <Dependency>knotifications-devel</Dependency>
+      <Dependency>kunitconversion-devel</Dependency>
+      <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kldap-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kimap-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkleo-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkdepim-devel</Dependency>
+      <Dependency versionFrom="25.04.2">pimcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kcalutils-devel</Dependency>
+      <Dependency versionFrom="25.04.2">mailcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">messagelib-devel</Dependency>
+      <Dependency versionFrom="25.04.2">eventviews-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kpimtextedit-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-mime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">grantleetheme-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-search-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmailtransport-devel</Dependency>
+      <Dependency versionFrom="25.04.2">incidenceeditor-devel</Dependency>
+      <Dependency versionFrom="25.04.2">calendarsupport-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-contacts-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-calendar-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kontactinterface-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kidentitymanagement-devel</Dependency>
+    </BuildDependencies>
+  </Source>
+  <Package>
+    <Name>korganizer</Name>
+    <Summary>Calendar and scheduling Program</Summary>
+    <RuntimeDependencies>
+      <Dependency>kio</Dependency>
+      <Dependency>ki18n</Dependency>
+      <Dependency>kmime</Dependency>
+      <Dependency>kcrash</Dependency>
+      <Dependency>kparts</Dependency>
+      <Dependency>libgcc</Dependency>
+      <Dependency>akonadi</Dependency>
+      <Dependency>kcodecs</Dependency>
+      <Dependency>kconfig</Dependency>
+      <Dependency>kxmlgui</Dependency>
+      <Dependency>kcmutils</Dependency>
+      <Dependency>kservice</Dependency>
+      <Dependency>qt6-base</Dependency>
+      <Dependency>kcalutils</Dependency>
+      <Dependency>kcontacts</Dependency>
+      <Dependency>kholidays</Dependency>
+      <Dependency>knewstuff</Dependency>
+      <Dependency>libkdepim</Dependency>
+      <Dependency>pimcommon</Dependency>
+      <Dependency>eventviews</Dependency>
+      <Dependency>kitemviews</Dependency>
+      <Dependency>mailcommon</Dependency>
+      <Dependency>qt6-phonon</Dependency>
+      <Dependency>kcompletion</Dependency>
+      <Dependency>kcoreaddons</Dependency>
+      <Dependency>kdbusaddons</Dependency>
+      <Dependency>kiconthemes</Dependency>
+      <Dependency>kitemmodels</Dependency>
+      <Dependency>kjobwidgets</Dependency>
+      <Dependency>akonadi-mime</Dependency>
+      <Dependency>kpimtextedit</Dependency>
+      <Dependency>kcalendarcore</Dependency>
+      <Dependency>kwindowsystem</Dependency>
+      <Dependency>akonadi-search</Dependency>
+      <Dependency>kconfigwidgets</Dependency>
+      <Dependency>kmailtransport</Dependency>
+      <Dependency>knotifications</Dependency>
+      <Dependency>kwidgetsaddons</Dependency>
+      <Dependency>calendarsupport</Dependency>
+      <Dependency>incidenceeditor</Dependency>
+      <Dependency>akonadi-calendar</Dependency>
+      <Dependency>akonadi-contacts</Dependency>
+      <Dependency>kontactinterface</Dependency>
+      <Dependency>kidentitymanagement</Dependency>
+    </RuntimeDependencies>
+    <Files>
+      <Path fileType="config">/etc/xdg</Path>
+      <Path fileType="executable">/usr/bin</Path>
+      <Path fileType="library">/usr/lib</Path>
+      <Path fileType="data">/usr/share</Path>
+      <Path fileType="doc">/usr/share/doc</Path>
+    </Files>
+    <Replaces>
+      <Package>korganizer-kf6</Package>
+    </Replaces>
+  </Package>
+  <History>
+    <Update release="50">
+      <Date>2025-06-08</Date>
+      <Version>25.04.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="49">
+      <Date>2025-05-08</Date>
+      <Version>25.04.1</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="48">
+      <Date>2025-04-20</Date>
+      <Version>25.04.0</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="47">
+      <Date>2025-04-02</Date>
+      <Version>24.12.3</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="46">
+      <Date>2025-02-06</Date>
+      <Version>24.12.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="45">
+      <Date>2025-01-09</Date>
+      <Version>24.12.1</Version>
+      <Comment>First release</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+  </History>
 </PISI>
diff --git a/desktop/kde/applications/pim-data-exporter/pspec.xml b/desktop/kde/applications/pim-data-exporter/pspec.xml
index 3e99f6bf93..d88e0f8ce6 100755
--- a/desktop/kde/applications/pim-data-exporter/pspec.xml
+++ b/desktop/kde/applications/pim-data-exporter/pspec.xml
@@ -1,141 +1,146 @@
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
-    <Source>
-        <Name>pim-data-exporter</Name>
-        <Homepage>https://community.kde.org/KDE_PIM</Homepage>
-        <Packager>
-            <Name>Stefan Gronewold</Name>
-            <Email>groni@pisilinux.org</Email>
-        </Packager>
-        <License>GPLv2</License>
-        <Summary>Import and export KDE PIM settings</Summary>
-        <Description>Import and export KDE PIM settings</Description>
-        <Archive sha1sum="14270968a635d496770d62d52c682fd4c901dd7b" type="tarxz">https://download.kde.org/stable/release-service/25.04.1/src/pim-data-exporter-25.04.1.tar.xz</Archive>
-        <BuildDependencies>
-            <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>kcrash-devel</Dependency>
-            <Dependency>kdbusaddons-devel</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-contacts-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-mime-devel</Dependency>
-            <Dependency versionFrom="25.04.1">calendarsupport-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kalarm</Dependency>
-            <Dependency>kcalendarcore-devel</Dependency>
-            <Dependency>kcontacts-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kmailtransport-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kpimtextedit-devel</Dependency>
-            <Dependency>qt6-base-devel</Dependency>
-            <Dependency>ktextwidgets-devel</Dependency>
-            <Dependency>kxmlgui-devel</Dependency>
-            <Dependency>kitemmodels-devel</Dependency>
-            <Dependency>boost-devel</Dependency>
-            <Dependency>kio-devel</Dependency>
-            <Dependency>ki18n-devel</Dependency>
-            <Dependency>kitemviews-devel</Dependency>
-            <Dependency>kunitconversion-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kmime-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kidentitymanagement-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-calendar-devel</Dependency>
-            <Dependency>kholidays-devel</Dependency>
-            <Dependency versionFrom="25.04.1">mailcommon-devel</Dependency>
-            <Dependency versionFrom="25.04.1">messagelib-devel</Dependency>
-            <Dependency versionFrom="25.04.1">pimcommon-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kimap-devel</Dependency>
-            <Dependency>cyrus-sasl-devel</Dependency>
-            <Dependency versionFrom="25.04.1">libkleo-devel</Dependency>
-            <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
-            <Dependency versionFrom="1.7.1">gpgme-qt6-devel</Dependency>
-            <Dependency versionFrom="25.04.1">libkdepim-devel</Dependency>
-            <Dependency>ffmpeg-devel</Dependency>
-            <Dependency>karchive-devel</Dependency>
-            <Dependency>libXScrnSaver-devel</Dependency>
-            <Dependency>knotifications-devel</Dependency>
-            <Dependency>kuserfeedback-devel</Dependency>
-            <Dependency>kstatusnotifieritem-devel</Dependency>
-            <Dependency>kiconthemes-devel</Dependency>
-        </BuildDependencies>
-    </Source>
-
-    <Package>
-        <Name>pim-data-exporter</Name>
-        <Summary>Import and export KDE PIM settings</Summary>
-        <RuntimeDependencies>
-            <Dependency>kio</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kmime</Dependency>
-            <Dependency>kcrash</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>akonadi</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>karchive</Dependency>
-            <Dependency>qt6-base</Dependency>
-            <Dependency>kalarm</Dependency>
-            <Dependency>kcontacts</Dependency>
-            <Dependency>libkdepim</Dependency>
-            <Dependency>pimcommon</Dependency>
-            <Dependency>kitemviews</Dependency>
-            <Dependency>mailcommon</Dependency>
-            <Dependency>messagelib</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kdbusaddons</Dependency>
-            <Dependency>kpimtextedit</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kmailtransport</Dependency>
-            <Dependency>knotifications</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>kstatusnotifieritem</Dependency>
-            <Dependency>kidentitymanagement</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="config">/etc/xdg</Path>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="data">/usr/share</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-        </Files>
-        <Replaces>
-            <Package>pim-data-exporter-kf6</Package>
-        </Replaces>
-    </Package>
-
-    <History>
-        <Update release="54">
-            <Date>2025-05-08</Date>
-            <Version>25.04.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="53">
-            <Date>2025-04-20</Date>
-            <Version>25.04.0</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="52">
-            <Date>2025-04-02</Date>
-            <Version>24.12.3</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="51">
-            <Date>2025-02-06</Date>
-            <Version>24.12.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="50">
-            <Date>2025-01-09</Date>
-            <Version>24.12.1</Version>
-            <Comment>First release</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-    </History>
+  <Source>
+    <Name>pim-data-exporter</Name>
+    <Homepage>https://community.kde.org/KDE_PIM</Homepage>
+    <Packager>
+      <Name>Stefan Gronewold</Name>
+      <Email>groni@pisilinux.org</Email>
+    </Packager>
+    <License>GPLv2</License>
+    <Summary>Import and export KDE PIM settings</Summary>
+    <Description>Import and export KDE PIM settings</Description>
+    <Archive sha1sum="ccdcf85e7ce56d283a6560564958cae1078fa4e4" type="tarxz">https://download.kde.org/stable/release-service/25.04.2/src/pim-data-exporter-25.04.2.tar.xz</Archive>
+    <BuildDependencies>
+      <Dependency>kio-devel</Dependency>
+      <Dependency>boost-devel</Dependency>
+      <Dependency>ki18n-devel</Dependency>
+      <Dependency>kcrash-devel</Dependency>
+      <Dependency>ffmpeg-devel</Dependency>
+      <Dependency>kxmlgui-devel</Dependency>
+      <Dependency>qt6-base-devel</Dependency>
+      <Dependency>karchive-devel</Dependency>
+      <Dependency>kdoctools-devel</Dependency>
+      <Dependency>kcontacts-devel</Dependency>
+      <Dependency>kholidays-devel</Dependency>
+      <Dependency>kitemviews-devel</Dependency>
+      <Dependency>cyrus-sasl-devel</Dependency>
+      <Dependency>kdbusaddons-devel</Dependency>
+      <Dependency>kitemmodels-devel</Dependency>
+      <Dependency>kiconthemes-devel</Dependency>
+      <Dependency>ktextwidgets-devel</Dependency>
+      <Dependency>extra-cmake-modules</Dependency>
+      <Dependency>kcalendarcore-devel</Dependency>
+      <Dependency>libXScrnSaver-devel</Dependency>
+      <Dependency>kuserfeedback-devel</Dependency>
+      <Dependency>knotifications-devel</Dependency>
+      <Dependency>kunitconversion-devel</Dependency>
+      <Dependency>kstatusnotifieritem-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kalarm</Dependency>
+      <Dependency versionFrom="25.04.2">kmime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kimap-devel</Dependency>
+      <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkleo-devel</Dependency>
+      <Dependency versionFrom="25.04.2">pimcommon-devel</Dependency>
+      <Dependency versionFrom="1.7.1">qgpgme-qt6-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libkdepim-devel</Dependency>
+      <Dependency versionFrom="25.04.2">mailcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">messagelib-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-mime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kpimtextedit-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmailtransport-devel</Dependency>
+      <Dependency versionFrom="25.04.2">calendarsupport-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-contacts-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-calendar-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kidentitymanagement-devel</Dependency>
+    </BuildDependencies>
+  </Source>
+  <Package>
+    <Name>pim-data-exporter</Name>
+    <Summary>Import and export KDE PIM settings</Summary>
+    <RuntimeDependencies>
+      <Dependency>kio</Dependency>
+      <Dependency>ki18n</Dependency>
+      <Dependency>kmime</Dependency>
+      <Dependency>kcrash</Dependency>
+      <Dependency>libgcc</Dependency>
+      <Dependency>kalarm</Dependency>
+      <Dependency>akonadi</Dependency>
+      <Dependency>kconfig</Dependency>
+      <Dependency>kxmlgui</Dependency>
+      <Dependency>karchive</Dependency>
+      <Dependency>qt6-base</Dependency>
+      <Dependency>kcontacts</Dependency>
+      <Dependency>libkdepim</Dependency>
+      <Dependency>pimcommon</Dependency>
+      <Dependency>kitemviews</Dependency>
+      <Dependency>mailcommon</Dependency>
+      <Dependency>messagelib</Dependency>
+      <Dependency>kcoreaddons</Dependency>
+      <Dependency>kdbusaddons</Dependency>
+      <Dependency>kpimtextedit</Dependency>
+      <Dependency>kconfigwidgets</Dependency>
+      <Dependency>kmailtransport</Dependency>
+      <Dependency>knotifications</Dependency>
+      <Dependency>kwidgetsaddons</Dependency>
+      <Dependency>kstatusnotifieritem</Dependency>
+      <Dependency>kidentitymanagement</Dependency>
+    </RuntimeDependencies>
+    <Files>
+      <Path fileType="config">/etc/xdg</Path>
+      <Path fileType="executable">/usr/bin</Path>
+      <Path fileType="library">/usr/lib</Path>
+      <Path fileType="data">/usr/share</Path>
+      <Path fileType="doc">/usr/share/doc</Path>
+    </Files>
+    <Replaces>
+      <Package>pim-data-exporter-kf6</Package>
+    </Replaces>
+  </Package>
+  <History>
+    <Update release="55">
+      <Date>2025-06-08</Date>
+      <Version>25.04.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="54">
+      <Date>2025-05-08</Date>
+      <Version>25.04.1</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="53">
+      <Date>2025-04-20</Date>
+      <Version>25.04.0</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="52">
+      <Date>2025-04-02</Date>
+      <Version>24.12.3</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="51">
+      <Date>2025-02-06</Date>
+      <Version>24.12.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="50">
+      <Date>2025-01-09</Date>
+      <Version>24.12.1</Version>
+      <Comment>First release</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+  </History>
 </PISI>
diff --git a/desktop/kde/applications/pim-sieve-editor/pspec.xml b/desktop/kde/applications/pim-sieve-editor/pspec.xml
index 84a7dadf9e..ef9c8d50cf 100755
--- a/desktop/kde/applications/pim-sieve-editor/pspec.xml
+++ b/desktop/kde/applications/pim-sieve-editor/pspec.xml
@@ -1,114 +1,119 @@
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
-    <Source>
-        <Name>pim-sieve-editor</Name>
-        <Homepage>https://community.kde.org/KDE_PIM</Homepage>
-        <Packager>
-            <Name>Stefan Gronewold</Name>
-            <Email>groni@pisilinux.org</Email>
-        </Packager>
-        <License>GPLv2</License>
-        <Summary>Mail sieve editor</Summary>
-        <Description>Mail sieve editor</Description>
-        <Archive sha1sum="21b160f81aa4fa4c1fcac2d2bdbcddaa9991cc0f" type="tarxz">https://download.kde.org/stable/release-service/25.04.1/src/pim-sieve-editor-25.04.1.tar.xz</Archive>
-        <BuildDependencies>
-            <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>kbookmarks-devel</Dependency>
-            <Dependency>kcrash-devel</Dependency>
-            <Dependency>kdbusaddons-devel</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency>kiconthemes-devel</Dependency>
-            <Dependency>kio-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kmailtransport-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kpimtextedit-devel</Dependency>
-            <Dependency versionFrom="25.04.1">messagelib-devel</Dependency>
-            <Dependency versionFrom="25.04.1">pimcommon-devel</Dependency>
-            <Dependency>qt6-base-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-mime-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-devel</Dependency>
-            <Dependency>kitemmodels-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kmime-devel</Dependency>
-            <Dependency>cyrus-sasl-devel</Dependency>
-            <Dependency>kcontacts-devel</Dependency>
-            <Dependency versionFrom="25.04.1">akonadi-contacts-devel</Dependency>
-            <Dependency versionFrom="25.04.1">kimap-devel</Dependency>
-            <Dependency versionFrom="25.04.1">libksieve-devel</Dependency>
-            <Dependency>ffmpeg-devel</Dependency>
-            <Dependency>kuserfeedback-devel</Dependency>
-            <Dependency>libXScrnSaver-devel</Dependency>
-            <Dependency>qt6-keychain-devel</Dependency>
-        </BuildDependencies>
-    </Source>
-
-    <Package>
-        <Name>pim-sieve-editor</Name>
-        <Summary>Mail sieve editor</Summary>
-        <RuntimeDependencies>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kcrash</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kwallet</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>qt6-base</Dependency>
-            <Dependency>libksieve</Dependency>
-            <Dependency>pimcommon</Dependency>
-            <Dependency>kbookmarks</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kdbusaddons</Dependency>
-            <Dependency>kiconthemes</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>qt6-keychain</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="config">/etc/xdg</Path>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="data">/usr/share</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-        </Files>
-        <Replaces>
-            <Package>pim-sieve-editor-kf6</Package>
-        </Replaces>
-    </Package>
-
-    <History>
-        <Update release="53">
-            <Date>2025-05-08</Date>
-            <Version>25.04.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="52">
-            <Date>2025-04-20</Date>
-            <Version>25.04.0</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="51">
-            <Date>2025-04-02</Date>
-            <Version>24.12.3</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="50">
-            <Date>2025-02-06</Date>
-            <Version>24.12.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-        <Update release="49">
-            <Date>2025-01-09</Date>
-            <Version>24.12.1</Version>
-            <Comment>First release</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Update>
-    </History>
+  <Source>
+    <Name>pim-sieve-editor</Name>
+    <Homepage>https://community.kde.org/KDE_PIM</Homepage>
+    <Packager>
+      <Name>Stefan Gronewold</Name>
+      <Email>groni@pisilinux.org</Email>
+    </Packager>
+    <License>GPLv2</License>
+    <Summary>Mail sieve editor</Summary>
+    <Description>Mail sieve editor</Description>
+    <Archive sha1sum="79ff3d48d95cc2123e4e3e800e7373d4caefb78c" type="tarxz">https://download.kde.org/stable/release-service/25.04.2/src/pim-sieve-editor-25.04.2.tar.xz</Archive>
+    <BuildDependencies>
+      <Dependency>kio-devel</Dependency>
+      <Dependency>kcrash-devel</Dependency>
+      <Dependency>ffmpeg-devel</Dependency>
+      <Dependency>qt6-base-devel</Dependency>
+      <Dependency>kdoctools-devel</Dependency>
+      <Dependency>kcontacts-devel</Dependency>
+      <Dependency>kbookmarks-devel</Dependency>
+      <Dependency>cyrus-sasl-devel</Dependency>
+      <Dependency>kdbusaddons-devel</Dependency>
+      <Dependency>kiconthemes-devel</Dependency>
+      <Dependency>kitemmodels-devel</Dependency>
+      <Dependency>qt6-keychain-devel</Dependency>
+      <Dependency>extra-cmake-modules</Dependency>
+      <Dependency>kuserfeedback-devel</Dependency>
+      <Dependency>libXScrnSaver-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kimap-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-devel</Dependency>
+      <Dependency versionFrom="25.04.2">pimcommon-devel</Dependency>
+      <Dependency versionFrom="25.04.2">libksieve-devel</Dependency>
+      <Dependency versionFrom="25.04.2">messagelib-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kpimtextedit-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-mime-devel</Dependency>
+      <Dependency versionFrom="25.04.2">kmailtransport-devel</Dependency>
+      <Dependency versionFrom="25.04.2">akonadi-contacts-devel</Dependency>
+    </BuildDependencies>
+  </Source>
+  <Package>
+    <Name>pim-sieve-editor</Name>
+    <Summary>Mail sieve editor</Summary>
+    <RuntimeDependencies>
+      <Dependency>ki18n</Dependency>
+      <Dependency>kcrash</Dependency>
+      <Dependency>libgcc</Dependency>
+      <Dependency>kconfig</Dependency>
+      <Dependency>kwallet</Dependency>
+      <Dependency>kxmlgui</Dependency>
+      <Dependency>qt6-base</Dependency>
+      <Dependency>libksieve</Dependency>
+      <Dependency>pimcommon</Dependency>
+      <Dependency>kbookmarks</Dependency>
+      <Dependency>kcoreaddons</Dependency>
+      <Dependency>kdbusaddons</Dependency>
+      <Dependency>kiconthemes</Dependency>
+      <Dependency>qt6-keychain</Dependency>
+      <Dependency>kconfigwidgets</Dependency>
+      <Dependency>kwidgetsaddons</Dependency>
+    </RuntimeDependencies>
+    <Files>
+      <Path fileType="config">/etc/xdg</Path>
+      <Path fileType="executable">/usr/bin</Path>
+      <Path fileType="library">/usr/lib</Path>
+      <Path fileType="data">/usr/share</Path>
+      <Path fileType="doc">/usr/share/doc</Path>
+    </Files>
+    <Replaces>
+      <Package>pim-sieve-editor-kf6</Package>
+    </Replaces>
+  </Package>
+  <History>
+    <Update release="54">
+      <Date>2025-06-08</Date>
+      <Version>25.04.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="53">
+      <Date>2025-05-08</Date>
+      <Version>25.04.1</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="52">
+      <Date>2025-04-20</Date>
+      <Version>25.04.0</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="51">
+      <Date>2025-04-02</Date>
+      <Version>24.12.3</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="50">
+      <Date>2025-02-06</Date>
+      <Version>24.12.2</Version>
+      <Comment>Version bump.</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+    <Update release="49">
+      <Date>2025-01-09</Date>
+      <Version>24.12.1</Version>
+      <Comment>First release</Comment>
+      <Name>Pisi Linux Community</Name>
+      <Email>admin@pisilinux.org</Email>
+    </Update>
+  </History>
 </PISI>