From 60a10e2c12180090b488c7ac69b9bed4e8144f88 Mon Sep 17 00:00:00 2001 From: François Andriot Date: Mon, 28 Sep 2026 22:03:22 +0200 Subject: RPM: update libraries packages (merge from r14.1.x) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/libraries/kipi-plugins/kipi-plugins.spec | 41 ++++++++++++---------- redhat/libraries/libkdcraw/libkdcraw.spec | 10 ++++-- redhat/libraries/libkipi/libkipi.spec | 11 ++++++ redhat/libraries/libksquirrel/libksquirrel.spec | 19 ++++++++++ redhat/libraries/libtdeldap/libtdeldap.spec | 9 +++-- redhat/libraries/pytde/pytde.spec | 3 +- .../libraries/pytdeextensions/pytdeextensions.spec | 4 +-- 7 files changed, 71 insertions(+), 26 deletions(-) diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec index 2fa458dec..f04091527 100644 --- a/redhat/libraries/kipi-plugins/kipi-plugins.spec +++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec @@ -109,7 +109,11 @@ BuildRequires: libgpod-devel >= 0.4.2 # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif @@ -140,20 +144,15 @@ BuildRequires: libxslt-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?pclinuxos} -BuildRequires: MesaGLU-devel -%else -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel -%endif +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel @@ -312,6 +311,8 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/kipiplugin_simpleviewer.so %{tde_tdelibdir}/kipiplugin_slideshow.la %{tde_tdelibdir}/kipiplugin_slideshow.so +%{tde_tdelibdir}/kipiplugin_sync.la +%{tde_tdelibdir}/kipiplugin_sync.so %{tde_tdelibdir}/kipiplugin_timeadjust.la %{tde_tdelibdir}/kipiplugin_timeadjust.so %{tde_tdelibdir}/kipiplugin_viewer.la @@ -329,6 +330,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/kipiplugin_rawconverter/ %{tde_datadir}/apps/kipiplugin_simpleviewerexport/ %{tde_datadir}/apps/kipiplugin_slideshow/ +%{tde_datadir}/apps/kipiplugin_sync/ %{tde_datadir}/apps/kipiplugin_viewer/ %{tde_datadir}/config.kcfg/htmlexportconfig.kcfg %{tde_datadir}/services/kipiplugin_acquireimages.desktop @@ -353,19 +355,20 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/services/kipiplugin_sendimages.desktop %{tde_datadir}/services/kipiplugin_simpleviewer.desktop %{tde_datadir}/services/kipiplugin_slideshow.desktop +%{tde_datadir}/services/kipiplugin_sync.desktop %{tde_datadir}/services/kipiplugin_timeadjust.desktop %{tde_datadir}/services/kipiplugin_viewer.desktop %{tde_datadir}/services/kipiplugin_wallpaper.desktop %{tde_mandir}/man1/images2mpg.1* -%{tde_tdedocdir}/HTML/de/kipi-plugins/ -%{tde_tdedocdir}/HTML/en/kipi-plugins/ -%{tde_tdedocdir}/HTML/es/kipi-plugins/ -%{tde_tdedocdir}/HTML/et/kipi-plugins/ -%{tde_tdedocdir}/HTML/it/kipi-plugins/ -%{tde_tdedocdir}/HTML/nl/kipi-plugins/ -%{tde_tdedocdir}/HTML/pt_BR/kipi-plugins/ -%{tde_tdedocdir}/HTML/ru/kipi-plugins/ -%{tde_tdedocdir}/HTML/sv/kipi-plugins/ +%lang(de) %{tde_tdedocdir}/HTML/de/kipi-plugins/ +%lang(en) %{tde_tdedocdir}/HTML/en/kipi-plugins/ +%lang(ed) %{tde_tdedocdir}/HTML/es/kipi-plugins/ +%lang(et) %{tde_tdedocdir}/HTML/et/kipi-plugins/ +%lang(it) %{tde_tdedocdir}/HTML/it/kipi-plugins/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/kipi-plugins/ +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/kipi-plugins/ +%lang(ru)%{tde_tdedocdir}/HTML/ru/kipi-plugins/ +%lang(sv)%{tde_tdedocdir}/HTML/sv/kipi-plugins/ %lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/*.mo %lang(be) %{tde_datadir}/locale/be/LC_MESSAGES/*.mo %lang(br) %{tde_datadir}/locale/br/LC_MESSAGES/*.mo diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec index 52d297bf3..11bd6404d 100644 --- a/redhat/libraries/libkdcraw/libkdcraw.spec +++ b/redhat/libraries/libkdcraw/libkdcraw.spec @@ -51,13 +51,14 @@ License: GPLv2+ #Vendor: Trinity Desktop #Packager: Francois Andriot -Prefix: /usr +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: libtool BuildRequires: gcc-c++ @@ -67,7 +68,11 @@ BuildRequires: gettext # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 -BuildRequires: liblcms2-devel +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else +BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif @@ -120,6 +125,7 @@ libkdcraw contains the library of libkdcraw. %package -n trinity-libkdcraw-common Summary: Raw picture decoding C++ library (runtime) [Trinity] Group: System/Libraries +Requires: trinity-filesystem >= %{tde_version} %description -n trinity-libkdcraw-common C++ interface around dcraw binary program used to decode RAW diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec index 8c8546eb5..197204270 100644 --- a/redhat/libraries/libkipi/libkipi.spec +++ b/redhat/libraries/libkipi/libkipi.spec @@ -73,6 +73,17 @@ BuildRequires: gettext BuildRequires: gcc-c++ BuildRequires: tqt3-dev-tools +# LCMS support +%if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else +BuildRequires: liblcms-devel +%endif +%else +BuildRequires: lcms-devel +%endif + # JPEG support %if 0%{?mdkver} %define libjpeg %{_lib}jpeg diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec index 2de3fa9e2..ef777bffa 100644 --- a/redhat/libraries/libksquirrel/libksquirrel.spec +++ b/redhat/libraries/libksquirrel/libksquirrel.spec @@ -91,12 +91,26 @@ BuildRequires: ghostscript BuildRequires: gettext BuildRequires: gettext-devel +# LCMS support +%if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else +BuildRequires: liblcms-devel +%endif +%else +BuildRequires: lcms-devel +%endif + # OPENEXR support +#define with_openexr 1 +%if 0%{?with_openexr} %if 0%{?mdkver} BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif +%endif # TIFF support %if 0%{?mdkver} @@ -273,8 +287,10 @@ This package contains the runtime libraries for KSquirrel. %{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0.8.0 %{tde_libdir}/ksquirrel-libs/libkls_neo.so.0 %{tde_libdir}/ksquirrel-libs/libkls_neo.so.0.8.0 +%if 0%{?with_openexr} %{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0 %{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0.8.0 +%endif %{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0 %{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0.8.0 %{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0 @@ -449,8 +465,10 @@ This package contains the development libraries for KSquirrel. %{tde_libdir}/ksquirrel-libs/libkls_mtv.so %{tde_libdir}/ksquirrel-libs/libkls_neo.la %{tde_libdir}/ksquirrel-libs/libkls_neo.so +%if 0%{?with_openexr} %{tde_libdir}/ksquirrel-libs/libkls_openexr.la %{tde_libdir}/ksquirrel-libs/libkls_openexr.so +%endif %{tde_libdir}/ksquirrel-libs/libkls_pcx.la %{tde_libdir}/ksquirrel-libs/libkls_pcx.so %{tde_libdir}/ksquirrel-libs/libkls_pi1.la @@ -602,6 +620,7 @@ fi \ -DBUILD_ALL=ON \ -DBUILD_DICOM=OFF \ + %{?!with_openexr:-DBUILD_OPENEXR=OFF} \ -DBUILD_PICT=OFF \ .. diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index e6e31905b..6d7d3685b 100644 --- a/redhat/libraries/libtdeldap/libtdeldap.spec +++ b/redhat/libraries/libtdeldap/libtdeldap.spec @@ -61,6 +61,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gcc-c++ BuildRequires: trinity-tde-cmake >= %{tde_version} @@ -77,7 +78,7 @@ BuildRequires: libtool-ltdl-devel # SASL support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}sasl-devel %else BuildRequires: %{_lib}sasl2-devel @@ -89,7 +90,7 @@ BuildRequires: cyrus-sasl-devel # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: lib64ldap-devel %else BuildRequires: openldap-devel @@ -114,7 +115,11 @@ BuildRequires: libheimdal-devel %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/libraries/pytde/pytde.spec b/redhat/libraries/pytde/pytde.spec index e310bc20f..9190287b0 100644 --- a/redhat/libraries/pytde/pytde.spec +++ b/redhat/libraries/pytde/pytde.spec @@ -93,7 +93,7 @@ from tdeio, tdejs, tdehtml and tdeprint. %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{python_sitearch}/*.so -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/dcopexport.py* %{python_sitearch}/dcopext.py* %{python_sitearch}/pytdeconfig.py* @@ -169,6 +169,7 @@ tips and working code you can use to learn from. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export LD_RUN_PATH="%{tde_libdir}" export DH_OPTIONS diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index 72b706ea3..b613e3af4 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec @@ -186,11 +186,11 @@ done %__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g" %endif -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 || 0%{?sle_version} >= 150600 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 || 0%{?sle_version} >= 150600 || 0%{?suse_version} >= 1699 %__sed -i "app_templates/kcontrol_module/setup.py" \ "app_templates/kcontrol_module/src/kcontrol_module.py" \ "app_templates/kdeapp/setup.py" \ - "app_templates/kdeapp/src/kdeapp.py" \ + "app_templates/kdeapp/src/tdeapp.py" \ "app_templates/kdeutility/setup.py" \ "app_templates/kdeutility/src/kdeutility.py" \ "app_templates/tdeioslave/setup.py" \ -- cgit v1.2.3