From 2fe7a94430ce7e4ef9ccc454de88f34d362b9e26 Mon Sep 17 00:00:00 2001 From: François Andriot Date: Tue, 29 Sep 2026 15:48:31 +0200 Subject: RPM: update applications 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/Makefile | 2 +- .../development/kxmleditor/kxmleditor.spec | 21 +- redhat/applications/development/piklab/piklab.spec | 25 +- redhat/applications/development/tdesvn/tdesvn.spec | 1 - .../development/tdexsldbg/tdexsldbg.spec | 189 +++++++++----- .../universal-indent-gui-tqt.spec | 156 +++++++++--- .../games/tdeknighttour/tdeknighttour.spec | 135 +++++++--- redhat/applications/graphics/digikam/digikam.spec | 64 ++--- .../applications/graphics/gwenview/gwenview.spec | 21 +- .../applications/graphics/ksquirrel/ksquirrel.spec | 83 +++--- .../internet/kasablanca/kasablanca.spec | 2 +- .../internet/konversation/konversation.spec | 4 +- .../applications/internet/ktorrent/ktorrent.spec | 46 ++-- redhat/applications/internet/kvirc/kvirc.spec | 100 +++++--- redhat/applications/internet/smb4k/smb4k.spec | 1 - redhat/applications/internet/tork/tork.spec | 27 +- redhat/applications/misc/kcmldap/kcmldap.spec | 13 +- .../misc/kcmldapcontroller/kcmldapcontroller.spec | 24 +- .../misc/kcmldapmanager/kcmldapmanager.spec | 10 +- .../misc/kerberostray/kerberostray.spec | 10 +- redhat/applications/misc/krecipes/krecipes.spec | 34 ++- redhat/applications/multimedia/amarok/amarok.spec | 66 ++--- .../applications/multimedia/codeine/codeine.spec | 7 +- redhat/applications/multimedia/k3b/k3b.spec | 30 ++- redhat/applications/multimedia/k9copy/k9copy.spec | 14 +- .../kaffeine-mozilla/kaffeine-mozilla.spec | 11 +- .../applications/multimedia/kaffeine/kaffeine.spec | 8 +- .../applications/multimedia/kmplayer/kmplayer.spec | 15 +- .../multimedia/mplayerthumbs/mplayerthumbs.spec | 11 +- .../multimedia/rosegarden/rosegarden.spec | 4 + .../multimedia/soundkonverter/soundkonverter.spec | 17 +- .../applications/multimedia/tderadio/tderadio.spec | 11 +- redhat/applications/office/kmymoney/kmymoney.spec | 23 +- redhat/applications/office/koffice/koffice.spec | 138 ++++++++-- .../office/tde-ebook-reader/tde-ebook-reader.spec | 279 ++++++++++++++------- redhat/applications/office/tellico/tellico.spec | 7 + redhat/applications/settings/kima/kima.spec | 4 + .../settings/kmyfirewall/kmyfirewall.spec | 59 +++-- .../settings/tde-guidance/tde-guidance.spec | 15 +- .../settings/tdealternatives/tdealternatives.spec | 127 +++++++--- .../tdenetworkmanager/tdenetworkmanager.spec | 5 +- .../settings/wlassistant/wlassistant.spec | 4 + redhat/applications/system/kbfx/kbfx.spec | 11 +- .../kdbusnotification/kdbusnotification.spec | 4 +- redhat/applications/system/krusader/krusader.spec | 21 +- .../applications/system/ksystemlog/ksystemlog.spec | 1 - redhat/applications/system/kvkbd/kvkbd.spec | 4 +- .../system/smartcardauth/smartcardauth.spec | 50 +++- .../system/tdepowersave/tdepowersave.spec | 8 +- .../themes/gtk3-tqt-engine/gtk3-tqt-engine.spec | 1 - .../tde-style-baghira/tde-style-baghira.spec | 11 +- .../themes/tde-style-domino/tde-style-domino.spec | 10 +- .../themes/tde-style-ia-ora/tde-style-ia-ora.spec | 14 +- .../twin-style-dekorator/twin-style-dekorator.spec | 8 +- .../twin-style-fahrenheit.spec | 7 +- .../twin-style-machbunt/twin-style-machbunt.spec | 9 +- .../twin-style-mallory/twin-style-mallory.spec | 161 ++++++++---- .../themes/twin-style-suse2/twin-style-suse2.spec | 6 +- redhat/applications/utilities/abakus/abakus.spec | 2 +- .../applications/utilities/kbarcode/kbarcode.spec | 8 +- .../applications/utilities/kommando/kommando.spec | 20 +- redhat/applications/utilities/krename/krename.spec | 1 - redhat/extras/trinity-desktop/trinity-desktop.spec | 1 + 63 files changed, 1536 insertions(+), 645 deletions(-) diff --git a/redhat/Makefile b/redhat/Makefile index 7b7701d82..f2878faf0 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -27,7 +27,7 @@ all: dependencies core libraries applications i18n meta external dependencies: tde-cmake tqt akode arts libart_lgpl libcaldav libcarddav polkit-tqt pytqt sip4-tqt tqca tqscintilla avahi-tqt dbus-1-tqt core: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions pytde -applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice kommando kompose konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tdebluez tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-polyester tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-fahrenheit twin-style-machbunt twin-style-suse2 wlassistant yakuake +applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice kommando kompose konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tdebluez tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-polyester tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-fahrenheit twin-style-machbunt twin-style-mallory twin-style-suse2 wlassistant yakuake i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n ### Trinity Dependencies diff --git a/redhat/applications/development/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec index a8f6d119f..053ed8c26 100644 --- a/redhat/applications/development/kxmleditor/kxmleditor.spec +++ b/redhat/applications/development/kxmleditor/kxmleditor.spec @@ -59,6 +59,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -74,6 +76,8 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release} + %description KXML Editor is a simple program, that displays and edits the contents of an @@ -85,21 +89,6 @@ contents. ########## -%package devel -Group: Applications/Multimedia -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: XML Editor for TDE (development files) - -%description devel -Development files for KXMLEditor. - -%files devel -%defattr(-,root,root,-) -%{tde_libdir}/libkxmleditorpart.la -%{tde_libdir}/libkxmleditorpart.so - -########## - %if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -164,6 +153,8 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/*/apps/kxmleditor.png %{tde_datadir}/icons/locolor/*/apps/kxmleditor.png %{tde_datadir}/services/kxmleditorpart.desktop +%{tde_libdir}/libkxmleditorpart.la +%{tde_libdir}/libkxmleditorpart.so %{tde_mandir}/man1/kxmleditor.1* diff --git a/redhat/applications/development/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec index b0793bbde..e5ce1c86c 100644 --- a/redhat/applications/development/piklab/piklab.spec +++ b/redhat/applications/development/piklab/piklab.spec @@ -58,6 +58,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-tde-cmake >= %{tde_version} @@ -83,7 +84,7 @@ BuildRequires: readline-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else -%if 0%{?fedora} >= 37 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else @@ -114,9 +115,11 @@ are supported. A command-line programmer and debugger are also available. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build @@ -124,12 +127,24 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \ + -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\ + -DDOC_INSTALL_DIR=%{tde_tdedocdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DCMAKE_INSTALL_RPATH=%{tde_libdir} \ - -DWITH_ALL_OPTIONS=OFF \ - -DWITH_GCC_VISIBILITY=OFF \ + \ -DBUILD_ALL=ON \ -DWITH_ALL_OPTIONS=ON \ .. diff --git a/redhat/applications/development/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec index decbeac2b..8e57c689c 100644 --- a/redhat/applications/development/tdesvn/tdesvn.spec +++ b/redhat/applications/development/tdesvn/tdesvn.spec @@ -289,7 +289,6 @@ fi -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DMAN_INSTALL_DIR=%{tde_mandir} \ - -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ -DBUILD_DOC=ON \ diff --git a/redhat/applications/development/tdexsldbg/tdexsldbg.spec b/redhat/applications/development/tdexsldbg/tdexsldbg.spec index 7e221fa98..6d265f3a6 100644 --- a/redhat/applications/development/tdexsldbg/tdexsldbg.spec +++ b/redhat/applications/development/tdexsldbg/tdexsldbg.spec @@ -1,7 +1,21 @@ # -# spec file for package tdexsldbg +# spec file for package tdexsldbg (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # +# TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" %define tde_version 14.2.0 @@ -17,43 +31,72 @@ %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 14.2.0 -Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: Graphical and text XSLT debugger for TDE -Group: Development/Tools/Other -URL: https://www.trinitydesktop.org/ -License: GPL-2.0-only -Prefix: %{tde_prefix} -Source0: trinity-%{tde_pkg}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tde-cmake >= %{tde_version} -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: libtqt3-mt-devel -BuildRequires: tqt3-dev-tools -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: gettext -BuildRequires: libicu-devel -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel -BuildRequires: readline-devel -BuildRequires: ncurses-devel + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: %{tde_version} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Graphical XSLT debugger for TDE +Group: Applications/Multimedia +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + +Obsoletes: trinity-kxsldbg < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release} %description -KXSLDbg is a graphical and text-based debugger for XSLT scripts. It can -run as a standalone application or as an embedded TDE part. +KXSLDbg is a debugger for XSLT scripts. It includes a graphical user +interface as well as a text-based debugger. KXSLDbg can be run as a +standalone application or as an embedded TDE part. + +XSLT is an XML language for defining transformations of XML files from +XML to some other arbitrary format, such as XML, HTML, plain text, etc., +using standard XSLT stylesheets. + +This package is part of TDE, as a component of the TDE web development module. +See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information. + +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif %prep -%setup -q -n trinity-%{tde_pkg}-%{tde_version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +%build if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build @@ -62,48 +105,74 @@ fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ - -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DBIN_INSTALL_DIR="%{tde_bindir}" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - -DDOC_INSTALL_DIR="%{tde_docdir}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DFORCE_DEBUGGER" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + \ -DBUILD_ALL=ON \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON \ - -DBUILD_EXAMPLE_DATA=OFF + -DWITH_ALL_OPTIONS=ON \ + .. %__make %{?_smp_mflags} || %__make + %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%files +%find_lang kxsldbg + +%files -f kxsldbg.lang %defattr(-,root,root,-) %doc COPYING COPYING-DOCS AUTHORS README.md %{tde_bindir}/kxsldbg %{tde_bindir}/xsldbg %{tde_tdelibdir}/libkxsldbgpart.la %{tde_tdelibdir}/libkxsldbgpart.so -%{tde_tdeappdir}/kxsldbg.desktop +%{tde_datadir}/applications/tde/kxsldbg.desktop %{tde_datadir}/applnk/.hidden/xsldbg.desktop -%{tde_datadir}/apps/kxsldbg/ -%{tde_datadir}/apps/kxsldbgpart/ -%{tde_tdedocdir}/HTML/en/kxsldbg/ -%{tde_tdedocdir}/HTML/en/xsldbg/ -%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png -%{tde_datadir}/icons/hicolor/*/actions/configure.png -%{tde_datadir}/icons/hicolor/*/actions/hash.png -%{tde_datadir}/icons/hicolor/*/actions/mark.png -%{tde_datadir}/icons/hicolor/*/actions/next.png -%{tde_datadir}/icons/hicolor/*/actions/step.png -%{tde_datadir}/icons/hicolor/*/actions/system-log-out.png -%{tde_datadir}/icons/hicolor/*/actions/system-run.png -%{tde_datadir}/icons/hicolor/*/actions/xsldbg_*.png -%{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png -%{tde_datadir}/icons/locolor/*/apps/kxsldbg.png -%{tde_datadir}/services/kxsldbg_part.desktop +%{tde_datadir}/apps/kxsldbg/kxsldbg_shell.rc +%{tde_datadir}/apps/kxsldbgpart/kxsldbg_part.rc +%lang(da) %{tde_tdedocdir}/HTML/da/kxsldbg/ +%lang(da) %{tde_tdedocdir}/HTML/da/xsldbg/ +%lang(de) %{tde_tdedocdir}/HTML/de/kxsldbg/ +%lang(en) %{tde_tdedocdir}/HTML/en/kxsldbg/ +%lang(en) %{tde_tdedocdir}/HTML/en/xsldbg/ +%lang(es) %{tde_tdedocdir}/HTML/es/kxsldbg/ +%lang(es) %{tde_tdedocdir}/HTML/es/xsldbg/ +%lang(et) %{tde_tdedocdir}/HTML/et/kxsldbg/ +%lang(et) %{tde_tdedocdir}/HTML/et/xsldbg/ +%lang(fr) %{tde_tdedocdir}/HTML/fr/kxsldbg/ +%lang(it) %{tde_tdedocdir}/HTML/it/kxsldbg/ +%lang(it) %{tde_tdedocdir}/HTML/it/xsldbg/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/kxsldbg/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/xsldbg/ +%lang(pt) %{tde_tdedocdir}/HTML/pt/kxsldbg/ +%lang(pt) %{tde_tdedocdir}/HTML/pt/xsldbg/ +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/kxsldbg/ +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/xsldbg/ +%lang(ru) %{tde_tdedocdir}/HTML/ru/kxsldbg/ +%lang(ru) %{tde_tdedocdir}/HTML/ru/xsldbg/ +%lang(sv) %{tde_tdedocdir}/HTML/sv/kxsldbg/ +%lang(sv) %{tde_tdedocdir}/HTML/sv/xsldbg/ +%{tde_datadir}/icons/hicolor/*/actions/*.png +%{tde_datadir}/icons/hicolor/*/apps/*.png +%{tde_datadir}/icons/locolor/*/apps/*.png %{tde_mandir}/man1/kxsldbg.1* +%{tde_datadir}/services/kxsldbg_part.desktop + + +%clean +%__rm -rf %{buildroot} + + +%changelog diff --git a/redhat/applications/development/universal-indent-gui-tqt/universal-indent-gui-tqt.spec b/redhat/applications/development/universal-indent-gui-tqt/universal-indent-gui-tqt.spec index 50615eb19..ef39a497f 100644 --- a/redhat/applications/development/universal-indent-gui-tqt/universal-indent-gui-tqt.spec +++ b/redhat/applications/development/universal-indent-gui-tqt/universal-indent-gui-tqt.spec @@ -1,9 +1,21 @@ # # spec file for package universal-indent-gui-tqt (version R14) # -# Copyright (c) 2026 Trinity Desktop Environment packaging contributors +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # +# TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" %define tde_version 14.2.0 @@ -13,59 +25,139 @@ %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: Universal source code indenter using TQt3 -Group: Development/Tools/Other -URL: http://www.trinitydesktop.org/ -# Upstream CMake comments say GPLv3+, but LICENSE.GPL and the distributed -# source headers consistently state GPLv2. -License: GPL-2.0-or-later -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tde-cmake >= %{tde_version} -BuildRequires: libtqscintilla-devel >= 1.7.1 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.2.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: GUI frontend for several code beautifiers +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility %if 0%{?suse_version} -BuildRequires: libtqt3-mt-devel >= 3.5.0 -BuildRequires: tqt3-dev-tools >= 3.5.0 +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity %endif + %description -Universal Indent GUI is a graphical source code formatting tool ported to -TQt3 for the Trinity Desktop Environment. +UniversalIndentGui is a GUI fontend for several code beautifiers, currently +supporting: + * Artistic Styler + * BCPP + * Cobol Beautify + * CSSTidy + * Fortran 90 PPR + * GNU Indent + * GreatCode + * hindent + * HTB + * Javascript Decoder + * JSPPP + * Perl Tidy + * PHP_Beautifier + * PHP Code Beautifier + * PHP Stylist + * pindent + * Ruby Beautify + * Ruby Formatter + * Shell Indent + * (HTML) Tidy + * Uncrustify + * XML Indent + +UniversalIndentGui allows you to tune a beautifier's configuration and see +how the changes affects a source example live. It is especially useful to +compare different C/C++ beautifiers when you have to choose one of them. + +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +rm -f src/svnqt/CMakeLists.txt.orig +#rm -fr src/svnqt/cache/sqlite3/ + %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_prefix}/%{_lib}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" + if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi + %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - -DBUILD_ALL=ON -%cmake_build + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DMAN_INSTALL_DIR=%{tde_mandir} \ + -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + -DBUILD_ALL="ON" \ + .. + +# SMP safe ! +%__make %{?_smp_mflags} || %__make + %install -%{__rm} -rf %{buildroot} -%cmake_install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + %files %defattr(-,root,root,-) %{tde_bindir}/universal-indent-gui-tqt %{tde_datadir}/universal-indent-gui-tqt/ + +%clean +%__rm -rf %{buildroot} + + %changelog diff --git a/redhat/applications/games/tdeknighttour/tdeknighttour.spec b/redhat/applications/games/tdeknighttour/tdeknighttour.spec index c8817b806..09f8993fc 100644 --- a/redhat/applications/games/tdeknighttour/tdeknighttour.spec +++ b/redhat/applications/games/tdeknighttour/tdeknighttour.spec @@ -1,73 +1,140 @@ # # spec file for package tdeknighttour (version R14) # -# Copyright (c) 2026 Trinity Desktop Environment packaging contributors +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # -%define tde_epoch 2 +# Default version for this component +%define tde_pkg tdeknighttour %if "%{?tde_version}" == "" %define tde_version 14.2.0 %endif -%define tde_pkg tdeknighttour + +# TDE specific building variables %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} -%define tde_tdeappdir %{tde_datadir}/applications/tde - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: Knight tour game for the Trinity Desktop Environment -Group: Amusements/Games -URL: http://www.trinitydesktop.org/ -License: GPL-2.0-or-later -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tde-cmake >= %{tde_version} -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: gcc-c++ -BuildRequires: gettext -%if 0%{?suse_version} -BuildRequires: libtqt3-mt-devel >= 3.5.0 -BuildRequires: tqt3-dev-tools >= 3.5.0 -%endif +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{tde_pkg} +Summary: A logic game for TDE +Version: 0.1.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: trinity-tdegames-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: gettext + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + %description -Knight tour game for the Trinity Desktop Environment. +A knight's tour is a sequence of moves of a knight on a chessboard such that +the knight visits every square exactly once. If the knight ends on a square +that is one knight's move from the beginning square (so that it could tour +the board again immediately, following the same path), the tour is closed +(or re-entrant); otherwise, it is open. + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi + %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ -DBUILD_ALL=ON \ - -DBUILD_TRANSLATIONS=ON -%cmake_build + .. + +%__make %{?_smp_mflags} + %install -%{__rm} -rf %{buildroot} -%cmake_install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + %find_lang %{tde_pkg} + +%clean +%__rm -rf %{buildroot} + + %files -f %{tde_pkg}.lang %defattr(-,root,root,-) +%doc AUTHORS COPYRIGHT README.md %{tde_bindir}/knighttour %{tde_tdeappdir}/knighttour.desktop + %changelog diff --git a/redhat/applications/graphics/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec index 2a19cca13..da02e1ad5 100644 --- a/redhat/applications/graphics/digikam/digikam.spec +++ b/redhat/applications/graphics/digikam/digikam.spec @@ -65,7 +65,7 @@ BuildRequires: trinity-libkexiv2-devel BuildRequires: trinity-libkdcraw-devel BuildRequires: trinity-libkipi-devel -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -91,7 +91,11 @@ BuildRequires: brp-check-trinity # 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 @@ -310,7 +314,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %lang(de) %{tde_tdedocdir}/HTML/de/digikam/ %lang(de) %{tde_tdedocdir}/HTML/de/showfoto/ %lang(es) %{tde_tdedocdir}/HTML/es/digikam/ -%lang(es) %{tde_tdedocdir}/HTML/es/showfoto/ %lang(et) %{tde_tdedocdir}/HTML/et/digikam/ %lang(et) %{tde_tdedocdir}/HTML/et/showfoto/ %lang(it) %{tde_tdedocdir}/HTML/it/digikam/ @@ -333,37 +336,37 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +# Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ -%if 0%{?rhel} == 5 - --with-included-sqlite3 -%else - --without-included-sqlite3 -%endif + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -371,7 +374,7 @@ export PATH="%{tde_bindir}:${PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -382,12 +385,15 @@ echo "NoDisplay=true" >> "$RPM_BUILD_ROOT%{tde_tdeappdir}/showfoto.desktop" install -D -m 644 "%{SOURCE1}" "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file digikam Graphics Photography %suse_update_desktop_file showfoto Graphics Viewer %suse_update_desktop_file "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop" %endif +# Remove unwanted pixmaps +%__rm -rf %{?buildroot}%{tde_datadir}/pixmaps + %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec index 1cdb73ca8..7490a3b72 100644 --- a/redhat/applications/graphics/gwenview/gwenview.spec +++ b/redhat/applications/graphics/gwenview/gwenview.spec @@ -63,11 +63,10 @@ BuildRequires: trinity-libkipi-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: tqt3-dev-tools -BuildRequires: libmng-devel # SUSE desktop files utility %if 0%{?suse_version} @@ -90,6 +89,13 @@ BuildRequires: libexiv2-devel BuildRequires: exiv2-devel %endif +# MNG support +%if 0%{?mdkver} +BuildRequires: %{_lib}mng-devel +%else +BuildRequires: libmng-devel +%endif + %if "%{?tde_prefix}" == "/usr" Conflicts: kdegraphics %endif @@ -145,7 +151,6 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ @@ -165,6 +170,15 @@ export PATH="%{tde_bindir}:${PATH}" # Removes useless files (-devel ?) %__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so +# Updates applications categories for openSUSE +%if 0%{?suse_version} && 0%{?suse_version} < 1600 +%suse_update_desktop_file gwenview RasterGraphics Viewer +%endif + +# Remove unwanted files +%__rm -rf "%{?buildroot}%{tde_datadir}/pixmaps" + + %clean %__rm -rf %{buildroot} @@ -210,7 +224,6 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg %{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz %{tde_datadir}/man/man1/gwenview.1* -%{tde_datadir}/pixmaps/gwenview.xpm %{tde_datadir}/services/gvdirpart.desktop %{tde_datadir}/services/gvimagepart.desktop %lang(en) %{tde_tdedocdir}/HTML/en/gwenview/ diff --git a/redhat/applications/graphics/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec index 4fae2f839..70ef09877 100644 --- a/redhat/applications/graphics/ksquirrel/ksquirrel.spec +++ b/redhat/applications/graphics/ksquirrel/ksquirrel.spec @@ -64,7 +64,7 @@ BuildRequires: gettext BuildRequires: trinity-libkipi-devel BuildRequires: trinity-libksquirrel-devel -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -80,24 +80,20 @@ BuildRequires: brp-check-trinity %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 "%{?distribution}" == "OpenMandriva Lx" -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%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 BuildRequires: Mesa-libGLU-devel %endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-Mesa-libGLU -%endif %description @@ -121,55 +117,46 @@ OpenGL and dynamic format support. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export kde_confdir="%{tde_confdir}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build fi -# FIXME: error during ./configure solved by CXXFLAGS below -export CXXFLAGS="${CXXFLAGS} -I%{tde_tdeincludedir}" - -# FIXME: FTBFS during ./configure under rhel8/rhel9 -%if 0%{?rhel} >= 8 -export CXXFLAGS="${CXXFLAGS} -fPIC" -%endif - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ +# Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -193,17 +180,11 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop %{tde_datadir}/apps/ksquirrel/ %{tde_datadir}/apps/ksquirrelpart/ -%config(noreplace) %{tde_confdir}/magic/x-ras.magic -%config(noreplace) %{tde_confdir}/magic/x-sun.magic -%config(noreplace) %{tde_confdir}/magic/x-utah.magic %{tde_tdedocdir}/HTML/*/ksquirrel %{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png %{tde_datadir}/mimelnk/image/*.desktop %{tde_datadir}/services/ksquirrelpart.desktop %{tde_mandir}/man1/ksquirrel.1 %{tde_mandir}/man1/ksquirrel-libs-configurator.1* -%config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc -%config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc -%config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc %changelog diff --git a/redhat/applications/internet/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec index ee59054c7..dbf2ce5d2 100644 --- a/redhat/applications/internet/kasablanca/kasablanca.spec +++ b/redhat/applications/internet/kasablanca/kasablanca.spec @@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Fix desktop files (openSUSE only) -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{buildroot}%{tde_tdeappdir}/kasablanca.desktop Network FileTransfer %endif diff --git a/redhat/applications/internet/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec index a217fcd71..287a90460 100644 --- a/redhat/applications/internet/konversation/konversation.spec +++ b/redhat/applications/internet/konversation/konversation.spec @@ -131,7 +131,7 @@ BuildRequires: libXi6-devel # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -232,7 +232,7 @@ fi -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ -DWITH_ALL_OPTIONS=ON \ - -DWITH_GCC_VISIBILITY=ON \ + %{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \ \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ diff --git a/redhat/applications/internet/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec index 51591f239..c98747f9b 100644 --- a/redhat/applications/internet/ktorrent/ktorrent.spec +++ b/redhat/applications/internet/ktorrent/ktorrent.spec @@ -95,15 +95,17 @@ Requires: avahi %endif # GEOIP +%if 0%{?rhel} >= 9 || 0%{?suse_version} >= 1600 +%define builtin_geoip 1 +%else %if 0%{?suse_version} %if 0%{?suse_version} < 1550 -%define with_system_geoip 1 BuildRequires: libGeoIP-devel %endif %else -%define with_system_geoip 1 BuildRequires: geoip-devel %endif +%endif %description KTorrent is a BitTorrent program for Trinity. Its features include speed capping @@ -124,40 +126,44 @@ enabling background downloading. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + %build if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DCMAKE_INSTALL_RPATH=%{tde_libdir} \ - -DWITH_GCC_VISIBILITY=OFF \ -%if 0%{?with_avahi} - -DWITH_ZEROCONF=ON \ -%else - -DWITH_ZEROCONF=OFF \ -%endif -%if 0%{?with_system_geoip} - -DWITH_SYSTEM_GEOIP=ON \ - -DWITH_BUILTIN_GEOIP=OFF \ -%else - -DWITH_SYSTEM_GEOIP=OFF \ + \ -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ +%if 0%{?builtin_geoip} -DWITH_BUILTIN_GEOIP=ON \ - -DWITH_BUILTIN_FLAGS=ON \ + -DWITH_SYSTEM_GEOIP=OFF \ %endif \ .. +# Fix build issue since 14.1.4 (settings.h not generated as expected) +pushd src/libktorrent +/opt/trinity/bin/tdeconfig_compiler ../../../src/libktorrent/ktorrent.kcfg ../../../src/libktorrent/settings.kcfgc +popd -# Not SMP safe ! -%__make +%__make %{?_smp_mflags} %install @@ -182,7 +188,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_bindir}/ktshell %{tde_bindir}/kttorinfo %{tde_bindir}/ktupnptest -%{tde_libdir}/libktorrent.so.2* +%{tde_libdir}/libktorrent.so.* %{tde_libdir}/libktorrent.la %{tde_tdelibdir}/ktinfowidgetplugin.la %{tde_tdelibdir}/ktinfowidgetplugin.so diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec index ed8b29158..618c2b823 100644 --- a/redhat/applications/internet/kvirc/kvirc.spec +++ b/redhat/applications/internet/kvirc/kvirc.spec @@ -62,6 +62,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-tde-cmake >= %{tde_version} @@ -69,6 +70,26 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes +# AUDIOFILE support +%if 0%{?rhel} >= 10 +%else +%define with_audiofile 1 +%endif +%if 0%{?with_audiofile} +BuildRequires: audiofile-devel +%endif + +# GSM support +%if 0%{?rhel} == 8 || 0%{?pclinuxos} +%else +%define with_gsm 1 +%if 0%{?sle_version} || 0%{?suse_version} +BuildRequires: libgsm-devel +%else +BuildRequires: gsm-devel +%endif +%endif + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -133,17 +154,11 @@ with the K Desktop Environment version 3. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# FTBFS on RHEL 5 -%if 0%{?rhel} == 5 -%__sed -i "admin/acinclude.m4.in" \ - -i "src/kvilib/tal/kvi_tal_application.cpp" \ - -e "/TDEApplication/ s|\")|\", true, true, true)|"; -%endif - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build @@ -151,30 +166,32 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DCMAKE_INSTALL_RPATH=%{tde_libdir} \ - -DWITH_ALL_OPTIONS=OFF \ - -DWITH_GCC_VISIBILITY=OFF \ - -DWITH_TDE=ON \ - -DWITH_BIG_CHANNELS=ON \ - -DWITH_CRYPT=ON \ - -DWITH_INFO_TIPS=ON \ - -DWITH_IPC=ON \ - -DWITH_IPV6=ON \ - -DWITH_PERL=ON \ - -DWITH_SSL=ON \ - -DWITH_SYSTEM_MEMMOVE=ON \ - -DWITH_TRANSPARENCY=ON \ - -DWITH_ZLIB=ON \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \ + -DINCLUDE_INSTALL_DIR="%{tde_includedir}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_AUDIOFILE=%{?with_audiofile:ON}%{!?with_audiofile:OFF} \ + -DWITH_GSM=%{?with_gsm:ON}%{!?with_gsm:OFF} \ + \ + -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ -DBUILD_TRANSLATIONS=ON \ \ .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install @@ -183,7 +200,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{buildroot}%{tde_tdeappdir}/kvirc.desktop Network IRCClient %endif @@ -197,32 +214,47 @@ export PATH="%{tde_bindir}:${PATH}" %doc ChangeLog FAQ README TODO %{tde_bindir}/kvirc %{tde_libdir}/*.so.* -%{tde_libdir}/kvirc/modules/*.so %files data %defattr(-,root,root,-) %{tde_bindir}/kvi_run_netscape %{tde_bindir}/kvi_search_help -%exclude %{tde_libdir}/kvirc/modules/*.la -%exclude %{tde_libdir}/kvirc/modules/*.so %{tde_libdir}/kvirc/ %{tde_tdeappdir}/kvirc.desktop +%{tde_datadir}/apps/kvirc/ %{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem.upd %{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem_upd.sh -%{tde_datadir}/apps/kvirc/ %{tde_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/icons/hicolor/*/*/*.svgz %{tde_datadir}/icons/hicolor/*/*/*.xpm -%{tde_datadir}/locale/*/LC_MESSAGES/kvirc*.mo %{tde_datadir}/mimelnk/text/*.desktop %{tde_mandir}/man1/kvirc.1 +%lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/*.mo +%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/*.mo +%lang(cs) %{tde_datadir}/locale/cs/LC_MESSAGES/*.mo +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo +%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo +%lang(es_AR) %{tde_datadir}/locale/es_AR/LC_MESSAGES/*.mo +%lang(fi) %{tde_datadir}/locale/fi/LC_MESSAGES/*.mo +%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/*.mo +%lang(hr) %{tde_datadir}/locale/hr/LC_MESSAGES/*.mo +%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/*.mo +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/*.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo +%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo +%lang(sr) %{tde_datadir}/locale/sr/LC_MESSAGES/*.mo +%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/*.mo %files devel %defattr(-,root,root,-) -%{tde_tdeincludedir}/kvirc/ +%{tde_includedir}/kvirc/ %{tde_libdir}/*.la %{tde_libdir}/*.so -%{tde_libdir}/kvirc/modules/*.la %changelog diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec index 61d791fa6..fba72010c 100644 --- a/redhat/applications/internet/smb4k/smb4k.spec +++ b/redhat/applications/internet/smb4k/smb4k.spec @@ -168,7 +168,6 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec index f7a6ea722..7266a51fb 100644 --- a/redhat/applications/internet/tork/tork.spec +++ b/redhat/applications/internet/tork/tork.spec @@ -65,7 +65,19 @@ BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes + +# GNUTLS support +%if 0%{?suse_version} BuildRequires: libgnutls-devel +%else +%if 0%{?pclinuxos} +BuildRequires: %{_lib}gcrypt-devel +BuildRequires: %{_lib}gnutls-devel +%else +BuildRequires: libgcrypt-devel +BuildRequires: gnutls-devel +%endif +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -85,15 +97,17 @@ BuildRequires: openssl-devel %endif # GEOIP +%if 0%{?rhel} >= 9 || 0%{?suse_version} >= 1600 +%define with_embedded_geoip 1 +%else %if 0%{?suse_version} %if 0%{?suse_version} < 1550 BuildRequires: libGeoIP-devel -%else -%define with_embedded_geoip 1 %endif %else BuildRequires: geoip-devel %endif +%endif %description @@ -140,7 +154,9 @@ fi -DBUILD_ALL=ON \ -DWITH_ALL_OPTIONS=ON \ -DWITH_EMBEDDED_GEOIP=%{?with_embedded_geoip:ON}%{?!with_embedded_geoip:OFF} \ +%if 0%{?pclinuxos} == 0 -DWITH_GNUTLS=ON \ +%endif \ .. @@ -161,7 +177,6 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README.md TODO USINGTORK -%{tde_datadir}/locale/*/LC_MESSAGES/libkickermenu_tork*.mo %{tde_bindir}/tork %{tde_bindir}/torkarkollon %{tde_bindir}/usewithtor @@ -189,6 +204,10 @@ fi %{tde_datadir}/pixmaps/tork.xpm %{tde_mandir}/man1/tork.1* %{tde_mandir}/man1/torkarkollon.1* - +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/libkickermenu_tork.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/libkickermenu_tork.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/*.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/libkickermenu_tork.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/libkickermenu_tork.mo %changelog diff --git a/redhat/applications/misc/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec index 67a9b98a9..6cb71acca 100644 --- a/redhat/applications/misc/kcmldap/kcmldap.spec +++ b/redhat/applications/misc/kcmldap/kcmldap.spec @@ -58,7 +58,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} -#BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -100,7 +99,7 @@ BuildRequires: brp-check-trinity # 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 @@ -128,7 +127,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 @@ -169,6 +172,8 @@ This is a TDE control center module to manage TDE connections to Kerberos realms %{tde_datadir}/pixmaps/kcmldapbonding_step1.png %{tde_datadir}/pixmaps/kcmldapbonding_step3.png %lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/kcmldap.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/kcmldap.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/kcmldap.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldap.mo ########## @@ -210,6 +215,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} + -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ +%endif -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec index d8ed9d7da..7d7a0100b 100644 --- a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec +++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec @@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity # 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 @@ -106,11 +106,20 @@ BuildRequires: heimdal-devel BuildRequires: libheimdal-devel %endif +# SLAPI support +%if 0%{?suse_version} == 0 +%define with_slapi 1 +%endif + # UDEV support %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 @@ -162,7 +171,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/primaryrccertupdater -%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || ( 0%{?rhel} >= 7 && 0%{?rhel} <= 9 ) %{tde_libdir}/slapi-acl-manager.la %{tde_libdir}/slapi-acl-manager.so %endif @@ -174,6 +183,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker %{tde_datadir}/pixmaps/kcmldapcontroller_step1.png %{tde_datadir}/pixmaps/kcmldapcontroller_step4.png %lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/kcmldapcontroller.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/kcmldapcontroller.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldapcontroller.mo ########## @@ -187,11 +197,6 @@ This is a TDE control center module to manage users, groups, and machines in Ker %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?pclinuxos} -%__rm -rf acl-updater -%endif - - %build unset QTDIR QTINC QTLIB @@ -204,6 +209,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} + -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ +%endif -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ @@ -219,6 +228,7 @@ fi -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ \ -DWITH_ALL_OPTIONS=ON \ + %{!?with_slapi:-DWITH_SLAPI=OFF} \ -DWITH_GCC_VISIBILITY=ON \ \ -DBUILD_ALL=ON \ diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec index 79514b5b4..7a9f741b8 100644 --- a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec +++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec @@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity # 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 @@ -107,7 +107,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 @@ -186,6 +190,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} + -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ +%endif -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec index e9d7f5125..c819d6a36 100644 --- a/redhat/applications/misc/kerberostray/kerberostray.spec +++ b/redhat/applications/misc/kerberostray/kerberostray.spec @@ -79,7 +79,7 @@ BuildRequires: brp-check-trinity # 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 @@ -107,7 +107,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 @@ -165,6 +169,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} + -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ +%endif -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec index 368e06501..fc8092f14 100644 --- a/redhat/applications/misc/krecipes/krecipes.spec +++ b/redhat/applications/misc/krecipes/krecipes.spec @@ -76,7 +76,11 @@ BuildRequires: brp-check-trinity %endif # MYSQL support +%if 0%{?rhel} >= 10 +BuildRequires: mariadb-devel +%else BuildRequires: mysql-devel +%endif # POSTGRESQL support BuildRequires: postgresql @@ -112,21 +116,35 @@ databases. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi +# Warning: GCC visibility causes FTBFS [Bug #1285] %cmake \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DCMAKE_INSTALL_RPATH=%{tde_libdir} \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ -DWITH_ALL_OPTIONS=ON \ -DBUILD_ALL=ON \ .. @@ -142,10 +160,13 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/krecipes.desktop" Education Chemistry +%if 0%{?suse_version} && 0%{?suse_version} < 1600 +%suse_update_desktop_file -r krecipes Education Chemistry %endif +# Remove unwanted pixmaps +%__rm -rf "%{buildroot}%{tde_datadir}/pixmaps/" + # Removes duplicate files %fdupes "%{buildroot}%{tde_datadir}" @@ -161,7 +182,6 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/krecipes/ %{tde_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png %{tde_datadir}/icons/hicolor/*/apps/krecipes.png -%{tde_datadir}/pixmaps/krecipes.xpm %{tde_datadir}/mimelnk/application/x-krecipes-backup.desktop %{tde_datadir}/mimelnk/application/x-krecipes-recipes.desktop %lang(da) %{tde_tdedocdir}/HTML/da/ diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index a59e6a58a..27f361756 100644 --- a/redhat/applications/multimedia/amarok/amarok.spec +++ b/redhat/applications/multimedia/amarok/amarok.spec @@ -62,6 +62,8 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-konqueror-devel >= %{tde_version} +BuildRequires: trinity-filesystem >= %{tde_version} +Requires: trinity-filesystem >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: trinity-tde-cmake >= %{tde_version} @@ -87,7 +89,7 @@ BuildRequires: brp-check-trinity %endif # ALSA supportl -%if "%{?distribution}" == "OpenMandriva Lx" +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel @@ -96,27 +98,39 @@ BuildRequires: alsa-lib-devel # ESOUND support #BuildRequires: esound-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif + # LIBTOOL BuildRequires: libtool -BuildRequires: libnjb-devel %if 0%{?fedora} > 4 || 0%{?rhel} > 4 BuildRequires: libtool-ltdl-devel %endif -%if 0%{?fedora} >= 37 +# LIBUSB support +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else BuildRequires: libusb-devel %endif -BuildRequires: mysql-devel + BuildRequires: taglib-devel +# MYSQL support +%if 0%{?rhel} >= 10 +BuildRequires: mariadb-devel +%else +BuildRequires: mysql-devel +%endif + # SDL support %if 0%{?mdkver} BuildRequires: %{_lib}SDL-devel -%elif 0%{?suse_version} -BuildRequires: sdl12_compat-devel %else BuildRequires: SDL-devel %endif @@ -156,28 +170,25 @@ BuildRequires: dbus-1-devel BuildRequires: dbus-devel %endif -# DBUS-(T)QT support -%if 0%{?rhel} == 4 -BuildRequires: dbus-qt -%else -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 -%endif - # DAAP support %define with_daap 0 # IFP support # IFP package is broken under PCLinuxOS. %if 0%{?pclinuxos} == 0 -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?fedora} && 0%{?fedora} <= 40 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_ifp 1 +%if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}ifp-devel +%else +BuildRequires: libifp-devel +%endif %endif %endif # KARMA support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 24090000 +%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 5000000 %define with_karma 1 BuildRequires: libkarma-devel BuildRequires: karma-sharp @@ -201,17 +212,17 @@ BuildRequires: libmtp-devel %endif # Creative Nomad Jukebox -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 +%if ( 0%{?fedora} >= 19 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?suse_version} >= 1220 && 0%{?suse_version} < 1600 ) %define with_njb 1 %if 0%{?mdkver} BuildRequires: %{_lib}njb-devel %else -BuildRequires: libmtp-devel +BuildRequires: libnjb-devel %endif %endif # VISUAL support -%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if ( 0%{?rhel} >= 4 && 0%{?rhel} <= 9 ) || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_libvisual 1 %if 0%{?mdkver} BuildRequires: %{_lib}visual-devel @@ -266,7 +277,7 @@ BuildRequires: xine-lib-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define with_xine 1 -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel @@ -278,8 +289,8 @@ BuildRequires: libxine-devel %endif # YAUAP support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_yauap 1 +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +#define with_yauap 1 %endif # AKODE support @@ -288,14 +299,6 @@ BuildRequires: libxine-devel BuildRequires: trinity-akode-devel %endif -# MP4V2 support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} < 24090000 -%define with_mp4v2 1 -BuildRequires: libmp4v2-devel -%endif -%endif - # ruby BuildRequires: ruby BuildRequires: ruby-devel @@ -545,7 +548,6 @@ fi %{?with_mtp:-DWITH_MTP=ON} \ %{?with_karma:-DWITH_RIOKARMA=ON} \ %{!?with_daap:-DWITH_DAAP=OFF} \ - %{?with_mp4v2:-DWITH_MP4V2=ON} \ %{?with_inotify:-DWITH_INOTIFY=ON} \ -DWITH_SYSTEM_SQLITE=ON \ -DBUILD_ALL=ON \ @@ -564,6 +566,10 @@ fi # Removes '.so' to avoid automatic -devel dependency %__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so +%if 0%{?with_libvisual} == 0 +%__rm -f $RPM_BUILD_ROOT%{tde_mandir}/man1/amarok_libvisual.1* +%endif + # Locales %find_lang %{tde_pkg} diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec index 7e3e04404..ca189326f 100644 --- a/redhat/applications/multimedia/codeine/codeine.spec +++ b/redhat/applications/multimedia/codeine/codeine.spec @@ -82,7 +82,7 @@ BuildRequires: brp-check-trinity %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel @@ -151,12 +151,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc COPYING FAQ README.md TODO %{tde_bindir}/codeine @@ -169,7 +171,6 @@ rm -rf $RPM_BUILD_ROOT %{tde_datadir}/services/codeine_part.desktop %{tde_tdelibdir}/libcodeine.la %{tde_tdelibdir}/libcodeine.so -%{tde_datadir}/locale/*/LC_MESSAGES/codeine.mo %changelog diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec index 870ccccd2..65289851b 100644 --- a/redhat/applications/multimedia/k3b/k3b.spec +++ b/redhat/applications/multimedia/k3b/k3b.spec @@ -78,13 +78,12 @@ BuildRequires: brp-check-trinity %endif # ALSA supportl -%if "%{?distribution}" == "OpenMandriva Lx" +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel %endif -BuildRequires: audiofile-devel BuildRequires: gettext BuildRequires: taglib-devel %if 0%{?suse_version} @@ -95,7 +94,11 @@ BuildRequires: zlib-devel # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif @@ -139,24 +142,32 @@ Requires(postun): coreutils Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29 +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29 || 0%{?rhel} >= 10 Requires: wodim REquires: genisoimage %else Requires: cdrecord REquires: mkisofs %endif + +# dvd+rw-tools support +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) Requires: dvd+rw-tools +%endif # CDRDAO support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 5 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) Requires: cdrdao %endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif @@ -174,9 +185,6 @@ BuildRequires: hal-devel # Dbus bindings were rebuilt with Qt support BuildRequires: dbus-devel >= 0.22-12.EL.9p1 Requires: dbus-qt >= 0.22-12.EL.9p1 -%else -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 -Requires: trinity-dbus-tqt >= 1:0.63 %endif # SNDFILE support @@ -269,11 +277,15 @@ BuildRequires: ffmpeg-devel %endif # MUSEPACK -%if 0%{?fedora} == 0 || 0%{?fedora} <= 37 +%if 0%{?fedora} <= 37 && 0%{?rhel} <= 9 # Looking for mpc_decoder_setup in mpcdec - not found -%define with_musepack 1 +#define with_musepack 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mgaversion} >= 10 +BuildRequires: %{_lib}musepack-devel +%else BuildRequires: %{_lib}mpcdec-devel +%endif %else BuildRequires: libmpcdec-devel %endif diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec index c189a8d91..de77bb503 100644 --- a/redhat/applications/multimedia/k9copy/k9copy.spec +++ b/redhat/applications/multimedia/k9copy/k9copy.spec @@ -89,24 +89,20 @@ BuildRequires: libdvdread-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 "%{?distribution}" == "OpenMandriva Lx" -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%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 BuildRequires: Mesa-libGLU-devel %endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-Mesa-libGLU -%endif %description diff --git a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec index 568aee132..75b8502a3 100644 --- a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec +++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec @@ -82,7 +82,7 @@ BuildRequires: nspr-devel %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}xaw-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 BuildRequires: libXaw-devel %endif @@ -121,6 +121,7 @@ fi -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_NO_BUILTIN_CHRPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \ @@ -141,6 +142,14 @@ export PATH="%{tde_bindir}:${PATH}" # Remove useless filess %__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a +%if 0%{?fedora} >= 43 +%__mv %{?buildroot}/usr/lib/ %{?buildroot}%{_libdir} +%endif + + +%clean +%__rm -rf %{buildroot} + %files %defattr(-,root,root,-) diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec index 165043d58..caa3bd7fb 100644 --- a/redhat/applications/multimedia/kaffeine/kaffeine.spec +++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec @@ -80,7 +80,11 @@ BuildRequires: brp-check-trinity # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif @@ -143,7 +147,7 @@ BuildRequires: %{_lib}xcb-devel %if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_gstreamer 1 %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gstreamer-devel BuildRequires: %{_lib}gst-plugins-base1.0-devel %else @@ -169,7 +173,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec index a6a93d47b..6edaf2a65 100644 --- a/redhat/applications/multimedia/kmplayer/kmplayer.spec +++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec @@ -77,14 +77,9 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -# DBUS support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} -%endif - # GSTREAMER support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gstreamer-devel BuildRequires: %{_lib}gst-plugins-base1.0-devel %else @@ -109,7 +104,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel @@ -126,8 +121,12 @@ BuildRequires: libxine-devel # X11 stuff %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: libxt-devel +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}xv-devel +%else BuildRequires: libxv-devel %endif +%endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210 BuildRequires: libXv-devel %endif @@ -139,7 +138,7 @@ BuildRequires: xorg-x11-libXv-devel %endif # GTK2 stuff -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gtk+2.0-devel %else BuildRequires: gtk2-devel diff --git a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec index e1d731dff..b03b487ed 100644 --- a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec +++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec @@ -58,6 +58,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -166,7 +168,14 @@ fi %{tde_datadir}/config.kcfg/mplayer-thumbnailer.kcfg %{tde_datadir}/services/mplayer-thumbnailer.desktop %{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/ -%{tde_datadir}/locale/*/LC_MESSAGES/mplayer-thumbnailer.mo +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/mplayer-thumbnailer.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/mplayer-thumbnailer.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/mplayer-thumbnailer.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/mplayer-thumbnailer.mo +%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/mplayer-thumbnailer.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/mplayer-thumbnailer.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/mplayer-thumbnailer.mo %changelog diff --git a/redhat/applications/multimedia/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec index d5c725b25..e9e621522 100644 --- a/redhat/applications/multimedia/rosegarden/rosegarden.spec +++ b/redhat/applications/multimedia/rosegarden/rosegarden.spec @@ -110,8 +110,12 @@ BuildRequires: ladspa-devel # RAPTOR support %if 0%{?mdkver} +%if 0%{?mgaversion} >= 10 +BuildRequires: %{_lib}raptor2-devel +%else BuildRequires: %{_lib}raptor-devel %endif +%endif # JACK support %if 0%{?mdkversion} || 0%{?mgaversion} diff --git a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec index 101fed72b..959cac528 100644 --- a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec +++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec @@ -58,9 +58,12 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig +BuildRequires: fdupes # SUSE desktop files utility %if 0%{?suse_version} @@ -149,14 +152,20 @@ fi -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ - -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ -DWITH_ALL_OPTIONS=ON \ + %{?!with_dvb:-DWITH_DVB=OFF} \ + %{?!with_lame:-DWITH_LAME=OFF} \ + %{?!with_xcb:-DWITH_XCB=OFF} \ -DBUILD_ALL=ON \ .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install diff --git a/redhat/applications/multimedia/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec index 2d77c8434..348764036 100644 --- a/redhat/applications/multimedia/tderadio/tderadio.spec +++ b/redhat/applications/multimedia/tderadio/tderadio.spec @@ -225,7 +225,16 @@ export PATH="%{tde_bindir}:${PATH}" %dir %{tde_datadir}/icons/hicolor/256x256/actions %{tde_datadir}/icons/hicolor/*/*/tderadio*.png %{tde_datadir}/icons/locolor/*/*/tderadio*.png -%{tde_datadir}/locale/*/LC_MESSAGES/tderadio*.mo +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo +%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/*.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo +%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %{tde_tdedocdir}/HTML/en/tderadio/ %{tde_mandir}/man1/convert-presets.1* %{tde_mandir}/man1/tderadio.1* diff --git a/redhat/applications/office/kmymoney/kmymoney.spec b/redhat/applications/office/kmymoney/kmymoney.spec index 5368d66a2..02be6ff9c 100644 --- a/redhat/applications/office/kmymoney/kmymoney.spec +++ b/redhat/applications/office/kmymoney/kmymoney.spec @@ -37,9 +37,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# Required for Mageia >= 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0.5 @@ -88,11 +85,16 @@ BuildRequires: html2ps BuildRequires: recode # OFX support +%if 0%{?rhel} <= 9 +%define with_libofx 1 +%endif +%if 0%{?with_libofx} %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}ofx-devel %else BuildRequires: libofx-devel %endif +%endif # OPENSP support %if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion} @@ -135,8 +137,10 @@ support. %{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop %{tde_datadir}/servicetypes/kmymoneyplugin.desktop %{tde_libdir}/*.so.* +%if 0%{?with_libofx} %{tde_tdelibdir}/kmm_ofximport.la %{tde_tdelibdir}/kmm_ofximport.so +%endif ########## @@ -155,21 +159,13 @@ have '%{name}' package installed, you will hardly find this package useful. %{tde_datadir}/apps/kmymoney2/ %{tde_datadir}/config.kcfg/kmymoney2.kcfg %{tde_datadir}/icons/hicolor/*/*/*.png -#%dir %{tde_datadir}/icons/Tango/ -#%dir %{tde_datadir}/icons/Tango/*/ -#%dir %{tde_datadir}/icons/Tango/*/*/ -#%{tde_datadir}/icons/Tango/*/*/*.png -#%{tde_datadir}/icons/Tango/scalable/*.svgz %{tde_datadir}/icons/locolor/*/*/*.png -#%dir %{tde_datadir}/icons/oxygen/ -#%dir %{tde_datadir}/icons/oxygen/*/ -#%dir %{tde_datadir}/icons/oxygen/*/*/ -#%{tde_datadir}/icons/oxygen/*/*/*.png -#%{tde_datadir}/icons/oxygen/scalable/*.svgz %{tde_tdedocdir}/HTML/en/kmymoney2/ %{tde_mandir}/man1/kmymoney2.* +%if 0%{?with_libofx} %{tde_datadir}/apps/kmm_ofximport/ %{tde_datadir}/services/kmm_ofximport.desktop +%endif ########## @@ -236,6 +232,7 @@ fi -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ \ -DWITH_ALL_OPTIONS=ON \ + %{!?with_libofx:-DWITH_LIBOFX=OFF} \ \ -DBUILD_ALL=ON \ \ diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec index 922fa4efc..d60741509 100644 --- a/redhat/applications/office/koffice/koffice.spec +++ b/redhat/applications/office/koffice/koffice.spec @@ -48,6 +48,10 @@ # Required for Mageia 2: removes the ldflag '--no-undefined' %global _disable_ld_no_undefined 1 +%if 0%{?mdkver} >= 5000000 +%global build_cxxflags %optflags -Wl,--allow-shlib-undefined +%endif + Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} @@ -102,15 +106,32 @@ BuildRequires: zlib-ng-compat-devel BuildRequires: zlib-devel %endif BuildRequires: gettext-devel -BuildRequires: mysql-devel BuildRequires: perl BuildRequires: doxygen BuildRequires: aspell-devel BuildRequires: readline-devel +# MYSQL support +%if 0%{?rhel} >= 10 +BuildRequires: mariadb-devel +%else +BuildRequires: mysql-devel +%endif + +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif + # EXIF support %if 0%{?mdkver} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}exif12-devel +%else BuildRequires: %{_lib}exif-devel +%endif %else BuildRequires: libexif-devel %endif @@ -138,11 +159,14 @@ BuildRequires: openssl-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} @@ -172,6 +196,22 @@ BuildRequires: %{python} BuildRequires: %{python}-devel %endif +# 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 + +# LCMS2 support +%if 0%{?suse_version} +BuildRequires: liblcms2-devel +%endif + # BZIP2 support %if 0%{?suse_version} BuildRequires: libbz2-devel @@ -201,7 +241,7 @@ BuildRequires: freetype-devel %if 0%{?mdkver} || 0%{?mgaversion} BuildRequires: %{_lib}png-devel %endif -%if 0%{?mdkversion} && 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0 +%if 0%{?mdkversion} && 0%{?mdkver} < 5000000 && 0%{?pclinuxos} == 0 BuildRequires: %{_lib}png15-devel %endif %if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} @@ -209,20 +249,38 @@ BuildRequires: libpng-devel %endif # GRAPHICSMAGICK support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) %define with_graphicsmagick 1 %if 0%{?suse_version} BuildRequires: GraphicsMagick >= 1.1.0 %endif %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} %if 0%{?mdkver} +%if 0%{?pclinuxos} +BuildRequires: graphicsmagick-devel +%else BuildRequires: %{_lib}graphicsmagick-devel +%endif %else BuildRequires: GraphicsMagick-devel >= 1.1.0 %endif %endif %endif +# UTEMPTER support +%if 0%{?suse_version} && 0%{?suse_version} < 1600 +BuildRequires: utempter-devel +%endif +%if 0%{?rhel} == 4 +BuildRequires: utempter +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}utempter-devel +%endif +%if 0%{?fedora} || 0%{?rhel} >= 5 +BuildRequires: libutempter-devel +%endif + # POPPLER support %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} %if 0%{?suse_version} >= 1500 @@ -245,7 +303,7 @@ BuildRequires: trinity-poppler-devel >= 0.12 %if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 && 0%{?pclinuxos} == 0 %define with_postgresql 1 BuildRequires: postgresql -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 +%if ( 0%{?fedora} >= 30 && 0%{?fedora} <= 43 ) || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 BuildRequires: postgresql-server-devel %else BuildRequires: postgresql-devel @@ -268,24 +326,34 @@ BuildRequires: libwpd-devel %endif Obsoletes: trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release} -# MESA support +# WV2 support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0 -BuildRequires: %{_lib}mesagl-devel -%endif -%if "%{?distribution}" == "OpenMandriva Lx" -BuildRequires: %{_lib}glu-devel +%define with_wv2 1 +%if 0%{mdkver} >= 5000000 +BuildRequires: wv2-devel %else -BuildRequires: %{_lib}mesaglu1-devel +BuildRequires: %{_lib}wv2-devel +%endif %endif +%if 0%{?rhel} || (0%{?fedora} && 0%{?fedora} <= 42) || 0%{?suse_version} +%define with_wv2 1 +BuildRequires: wv2-devel %endif + +# MESA support %if 0%{?fedora} || 0%{?rhel} -BuildRequires: libGL-devel -BuildRequires: libGLU-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel %endif -%if 0%{?suse_version} >= 1220 -BuildRequires: Mesa-libGL-devel -BuildRequires: Mesa-libGLU-devel +%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 +BuildRequires: Mesa-libGLU-devel %endif # LIBXI support @@ -333,6 +401,7 @@ Requires: %{name}-kchart = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-kformula = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-kplato = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-chalk = %{?epoch:%{epoch}:}%{version}-%{release} %description suite KOffice is an integrated office suite. @@ -849,6 +918,9 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_tdelibdir}/libwmlimport.* %{tde_tdelibdir}/libwpexport.* %{tde_tdelibdir}/libwpimport.* +%if 0%{?with_wv2} +%{tde_tdelibdir}/libmswordimport.* +%endif %{tde_tdelibdir}/libxsltimport.* %{tde_tdelibdir}/libxsltexport.* %{tde_tdelibdir}/libhancomwordimport.* @@ -884,7 +956,6 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} ########## -%if 0 %package chalk Summary: pixel-based image manipulation program for the TDE Office Suite [Trinity] Group: Applications/Productivity @@ -1021,15 +1092,17 @@ This package is part of the TDE Office Suite. %{tde_tdelibdir}/libchalkgmagickexport.so %{tde_tdelibdir}/libchalkgmagickimport.la %{tde_tdelibdir}/libchalkgmagickimport.so +%endif %{tde_tdelibdir}/libchalkjpegexport.la %{tde_tdelibdir}/libchalkjpegexport.so %{tde_tdelibdir}/libchalkjpegimport.la %{tde_tdelibdir}/libchalkjpegimport.so -%endif +%if 0%{?with_openexr} %{tde_tdelibdir}/libchalk_openexr_export.la %{tde_tdelibdir}/libchalk_openexr_export.so %{tde_tdelibdir}/libchalk_openexr_import.la %{tde_tdelibdir}/libchalk_openexr_import.so +%endif %{tde_tdelibdir}/libchalkpart.la %{tde_tdelibdir}/libchalkpart.so %{tde_tdelibdir}/libchalkpdfimport.la @@ -1068,8 +1141,6 @@ This package is part of the TDE Office Suite. ########## -%endif - %package chalk-data Summary: data files for Chalk painting program [Trinity] Group: Applications/Productivity @@ -1084,8 +1155,13 @@ This package is part of the TDE Office Suite. %files chalk-data %defattr(-,root,root,-) +%{tde_tdeappdir}/chalk.desktop +%{tde_datadir}/applnk/.hidden/chalk_*.desktop %{tde_datadir}/apps/chalk/ +%{tde_datadir}/apps/chalkplugins/ %lang(en) %{tde_tdedocdir}/HTML/en/chalk/ +%{tde_datadir}/services/chalk*.desktop +%{tde_datadir}/servicetypes/chalk*.desktop ########## @@ -1118,8 +1194,12 @@ RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])') CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" %endif -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1600 CXXFLAGS="${CXXFLAGS} -std=c++17" +%else +%if 0%{?suse_version} >= 1550 +CXXFLAGS="${CXXFLAGS} -std=c++11" +%endif %endif # FTBFS on RHEL 5 @@ -1152,10 +1232,18 @@ CXXFLAGS="${CXXFLAGS} -std=c++17" %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \ %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \ -%if %{?with_postgresql} -# Ensure PQXX was detected - +# Ensure PQXX was detected (required by kexidb/pgsql) +%if "%{?with_postgresql}" != "" +if grep 'S\["compile_pgsql_plugin_TRUE"\]="#"' config.status; then + exit 1 +fi +%endif +# Ensure WV2 was detected +%if 0%{?with_wv2} +if grep 'S\["include_wv2_msword_filter_TRUE"\]="#"' config.status; then + exit 2 +fi %endif %__make %{?_smp_mflags} || %__make @@ -1169,7 +1257,7 @@ CXXFLAGS="${CXXFLAGS} -std=c++17" %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kudesigner Office FlowChart %suse_update_desktop_file kivio Office FlowChart %suse_update_desktop_file kchart Office FlowChart diff --git a/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec b/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec index ef7810c48..847e4596b 100644 --- a/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec +++ b/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec @@ -1,7 +1,21 @@ # -# spec file for package tde-ebook-reader +# spec file for package tde-ebook-reader (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # +# TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" %define tde_version 14.2.0 @@ -16,125 +30,222 @@ %define tde_mandir %{tde_datadir}/man %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.99.6 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: e-book reader for TDE +Group: Applications/Publishing +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 0.99.4 -Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: TDE ebook reader -Group: Applications/Office -URL: https://www.trinitydesktop.org/ -License: GPL-2.0-only -Prefix: %{tde_prefix} -Source0: trinity-%{tde_pkg}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tde-cmake >= %{tde_version} -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: libtqt3-mt-devel -BuildRequires: tqt3-dev-tools -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: gettext %if 0%{?suse_version} -BuildRequires: zlib-ng-compat-devel +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: gettext + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# UNIBREAK support +%if 0%{?mgaversion} || 0%{?mdkver} >= 5000000 || 0%{?pclinuxos} +BuildRequires: %{_lib}unibreak-devel %else -BuildRequires: zlib-devel +BuildRequires: libunibreak-devel +%endif + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity %endif -BuildRequires: libbz2-devel -BuildRequires: libexpat-devel -BuildRequires: fribidi-devel -BuildRequires: sqlite3-devel -BuildRequires: libunibreak-devel %description -TDE ebook reader based on the ZLibrary TQt toolkit. +tde-ebook-reader is an e-book reader for TDE. + +Main features: + * supports several open e-book formats: fb2, html, chm, plucker, + palmdoc, ztxt, tcr (psion text), rtf, oeb, openreader, non-DRM'ed + mobipocket, plain text, epub, eReader + * reads directly from tar, zip, gzip, bzip2 archives (you can have + several books in one archive) + * supports a structured view of your e-book collection + * automatically determines encodings + * automatically generates a table of contents + * keeps the last open book and the last read positions for all open books + between runs + * automatic hyphenation (patterns for several languages are included) + * searching and downloading books from www.feedbooks.com and www.litres.ru + * partial CSS support for epub files + +%files +%defattr(-,root,root,-) +%{tde_bindir}/tde-ebook-reader +%{tde_tdeappdir}/tde-ebook-reader.desktop +%{tde_datadir}/apps/tde-ebook-reader/ +%{tde_mandir}/man1/tde-ebook-reader.1* + +########## + +%package -n libzlcore-tqt +Requires: libzlcore-data-tqt +Summary: Summary: TQt3-based development library (shared library) + +%description -n libzlcore-tqt +This is the core of Summary: , the library that tde-ebook-reader is based on. + +%files -n libzlcore-tqt +%{tde_libdir}/libzlcore-tqt.so.* + +########## + +%package -n libzlcore-tqt-devel +Requires: libzlcore-tqt +Summary: TQt3-based development library (development files) + +%description -n libzlcore-tqt-devel +This package contains development files for the Summary: core. + +%files -n libzlcore-tqt-devel +%{tde_includedir}/zlibrary-tqt/core +%{tde_libdir}/libzlcore-tqt.la +%{tde_libdir}/libzlcore-tqt.so -%package -n trinity-zlcore-tqt0 -Summary: Runtime library for TDE ebook reader core -Group: System/Libraries +########## -%description -n trinity-zlcore-tqt0 -Runtime library for the core of the TDE ebook reader. +%package -n libzlcore-data-tqt +Summary: TQt3-based development library (support files) -%post -n trinity-zlcore-tqt0 -p /sbin/ldconfig -%postun -n trinity-zlcore-tqt0 -p /sbin/ldconfig +%description -n libzlcore-data-tqt +This package contains the support files for the core of Summary: , the library +that the fbreader e-book reader is based on. -%package -n trinity-zltext-tqt0 -Summary: Runtime library for TDE ebook reader text support -Group: System/Libraries +%files -n libzlcore-data-tqt +%{tde_datadir}/zlibrary-tqt/keynames.desktop-tqt.xml +%{tde_datadir}/zlibrary-tqt/languagePatterns.zip +%{tde_datadir}/zlibrary-tqt/unicode.xml.gz +%{tde_datadir}/zlibrary-tqt/default/ +%{tde_datadir}/zlibrary-tqt/encodings/ +%{tde_datadir}/zlibrary-tqt/resources/ -%description -n trinity-zltext-tqt0 -Runtime library for text support in the TDE ebook reader. +########## -%post -n trinity-zltext-tqt0 -p /sbin/ldconfig -%postun -n trinity-zltext-tqt0 -p /sbin/ldconfig +%package -n libzltext-tqt +Requires: libzlcore-tqt +Requires: libzltext-data-tqt +Summary: TQt3-based text model/viewer part (shared library) -%package devel -Summary: Development files for TDE ebook reader libraries -Group: Development/Libraries/C and C++ -Requires: trinity-zlcore-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: trinity-zltext-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release} +%description -n libzltext-tqt +This package provides text model/viewer part of Summary: . + +%files -n libzltext-tqt +%{tde_libdir}/libzltext-tqt.so.* + +########## + +%package -n libzltext-tqt-devel +Requires: libzltext-tqt +Summary: TQt3-based text model/viewer part (development files) + +%description -n libzltext-tqt-devel +This package contains development files for the Summary: text model/viewer +library. + +%files -n libzltext-tqt-devel +%{tde_includedir}/zlibrary-tqt/text +%{tde_libdir}/libzltext-tqt.la +%{tde_libdir}/libzltext-tqt.so + +########## + +%package -n libzltext-data-tqt +Summary: TQt3-based text model/viewer part (support files) + +%description -n libzltext-data-tqt +This package contains the support files for the text model/viewer part +of Summary: . + +%files -n libzltext-data-tqt +%{tde_datadir}/zlibrary-tqt/hyphenationPatterns.zip + +########## + +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## -%description devel -Headers and unversioned libraries for developing against the TDE ebook reader -libraries. %prep -%setup -q -n trinity-%{tde_pkg}-%{tde_version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi +# Warning: GCC visibility causes the KCM not to work at all ! %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ - -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DCMAKE_ZLIBRARY_INSTALL_PREFIX="%{tde_prefix}" \ - -DZL_SHARE_INSTALL_PREFIX="%{tde_datadir}/zlibrary-tqt" \ - -DZL_INCLUDE_INSTALL_DIR="%{tde_includedir}/zlibrary-tqt" \ - -DZL_LIB_INSTALL_DIR="%{tde_libdir}" \ - -DBUILD_ALL=ON \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON - -%__make %{?_smp_mflags} || %__make + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + .. + +%__make %{?_smp_mflags} + + %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%files -%defattr(-,root,root,-) -%doc LICENSE ChangeLog -%{tde_bindir}/tde-ebook-reader -%{tde_tdeappdir}/tde-ebook-reader.desktop -%{tde_mandir}/man1/tde-ebook-reader.1* -%{tde_datadir}/zlibrary-tqt/ -%{tde_datadir}/apps/tde-ebook-reader/ -%files -n trinity-zlcore-tqt0 -%defattr(-,root,root,-) -%{tde_libdir}/libzlcore-tqt.so.0* -%files -n trinity-zltext-tqt0 -%defattr(-,root,root,-) -%{tde_libdir}/libzltext-tqt.so.0* +%clean +%__rm -rf %{buildroot} -%files devel -%defattr(-,root,root,-) -%{tde_includedir}/zlibrary-tqt/ -%{tde_libdir}/libzlcore-tqt.so -%{tde_libdir}/libzlcore-tqt.la -%{tde_libdir}/libzltext-tqt.so -%{tde_libdir}/libzltext-tqt.la + + +%changelog diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec index cff618e06..89eadfbb5 100644 --- a/redhat/applications/office/tellico/tellico.spec +++ b/redhat/applications/office/tellico/tellico.spec @@ -136,6 +136,13 @@ BuildRequires: libexempi-devel BuildRequires: exempi-devel %endif +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif + # IDN support BuildRequires: libidn-devel diff --git a/redhat/applications/settings/kima/kima.spec b/redhat/applications/settings/kima/kima.spec index 69562ba42..7daa1f219 100644 --- a/redhat/applications/settings/kima/kima.spec +++ b/redhat/applications/settings/kima/kima.spec @@ -81,7 +81,11 @@ BuildRequires: brp-check-trinity %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/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec index 2174fe2cb..8e6f1ab82 100644 --- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec +++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec @@ -62,7 +62,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -90,7 +90,7 @@ configure your rule set one time and then you can use it on several computers giving each of them a similar configuration (p.e. school networks, office, university etc.) -%files -f %{tde_pkg}-all.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO %{tde_bindir}/kmyfirewall @@ -136,11 +136,10 @@ university etc.) %{tde_datadir}/apps/kmfsystray/ %{tde_datadir}/apps/kmyfirewall/ %{tde_datadir}/config.kcfg/kmfconfig.kcfg -%config(noreplace) %{tde_confdir}/kmyfirewallrc +%config(noreplace) %{_sysconfdir}/kmyfirewallrc %{tde_tdedocdir}/HTML/en/kmyfirewall/ %{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png %{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png -%{tde_datadir}/pixmaps/kmyfirewall.xpm %{tde_datadir}/mimelnk/application/kmfgrs.desktop %{tde_datadir}/mimelnk/application/kmfnet.desktop %{tde_datadir}/mimelnk/application/kmfpkg.desktop @@ -148,6 +147,17 @@ university etc.) %{tde_datadir}/services/kmf*.desktop %{tde_datadir}/servicetypes/kmf*.desktop %{tde_mandir}/man1/kmyfirewall.1* +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/kmyfirewall.mo +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/kmfsystray.mo +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/kmyfirewall.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kmfsystray.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/kmfsystray.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kmfsystray.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kmyfirewall.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/kmfsystray.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/kmyfirewall.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kmfsystray.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kmyfirewall.mo ########## @@ -178,10 +188,11 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export kde_confdir="%{tde_confdir}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build @@ -189,31 +200,45 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ - -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \ - -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ - -DBUILD_TRANSLATIONS=ON - -%__make -j1 + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \ + -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\ + -DDOC_INSTALL_DIR=%{tde_tdedocdir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + \ + -DBUILD_DOC=ON \ + -DBUILD_ALL=ON \ + .. + +# Not SMP safe ! +%__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang %{tde_pkg} -%find_lang kmfsystray -cat %{tde_pkg}.lang kmfsystray.lang > %{tde_pkg}-all.lang # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kmyfirewall.desktop" System Network %endif +# Remove unwanted pixmaps +%__rm -rf "%{buildroot}%{tde_datadir}/pixmaps/" + %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index c58f1ad43..aa38d0c0c 100644 --- a/redhat/applications/settings/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -99,7 +99,7 @@ BuildRequires: trinity-pytqt-tools # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -145,6 +145,7 @@ BuildRequires: xscreensaver-gl %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} BuildRequires: %{python} BuildRequires: %{python}-devel +BuildRequires: %{python}-setuptools Requires: pytqt Requires: trinity-pytde @@ -183,7 +184,7 @@ or can be run as standalone applications. %{tde_datadir}/apps/guidance/ %{tde_tdeappdir}/*.desktop %{tde_datadir}/icons/crystalsvg/*/*/*.png -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitelib}/tde-guidance/SMBShareSelectDialog.py* %{python_sitelib}/tde-guidance/SimpleCommandRunner.py* %{python_sitelib}/tde-guidance/fuser.py* @@ -249,7 +250,7 @@ Guidance configuration tools. %files backends %defattr(-,root,root,-) %dir %{python_sitelib}/tde-guidance -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitelib}/tde-guidance/MicroHAL.py* %if 0%{?rhel} == 7 %{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc @@ -361,7 +362,6 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ @@ -377,6 +377,13 @@ fi %__rm -fr $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build +%if 0%{?pclinuxos} +if [ ! -d %{?buildroot}%{python_sitelib} ]; then + mkdir -p %{?buildroot}%{python_sitelib} + mv %{?buildroot}/tde-guidance %{?buildroot}%{python_sitelib} +fi +%endif + %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/settings/tdealternatives/tdealternatives.spec b/redhat/applications/settings/tdealternatives/tdealternatives.spec index a5f3c28f3..c5fa85b86 100644 --- a/redhat/applications/settings/tdealternatives/tdealternatives.spec +++ b/redhat/applications/settings/tdealternatives/tdealternatives.spec @@ -1,7 +1,21 @@ # -# spec file for package tdealternatives +# spec file for package tdealternatives (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # +# TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" %define tde_version 14.2.0 @@ -17,32 +31,66 @@ %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 14.2.0 -Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: TDE alternatives configuration module -Group: System/GUI/TDE -URL: https://www.trinitydesktop.org/ -License: GPL-3.0-only -Prefix: %{tde_prefix} -Source0: trinity-%{tde_pkg}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tde-cmake >= %{tde_version} -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: libtqt3-mt-devel -BuildRequires: tqt3-dev-tools -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: gettext - -Requires: trinity-tdebase >= %{tde_version} + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.10 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: A TDE control module to manage Mandrake/Debian alternative programs +Group: Applications/Utilities +URL: http://www.elliptique.net/~ken/tdealternatives/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: gettext + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + %description -TDE control module for inspecting and changing RPM alternatives. +TDEAlternatives is a TDE program that allows you to easily configure and +change your Mandrake/Debian alternatives system. + +########## + +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + %prep -%setup -q -n trinity-%{tde_pkg}-%{tde_version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + %build unset QTDIR QTINC QTLIB @@ -58,25 +106,39 @@ fi -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - -DDOC_INSTALL_DIR="%{tde_docdir}" \ - -DWITH_DISTRIBUTION_RPM=ON \ - -DWITH_DISTRIBUTION_DPKG=OFF \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ -DBUILD_ALL=ON \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON + -DWITH_ALL_OPTIONS=ON \ + -DWITH_DISTRIBUTION_RPM=ON \ + \ + .. %__make %{?_smp_mflags} || %__make + %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build + + %find_lang %{tde_pkg} + + +%clean +%__rm -rf %{buildroot} + + %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc COPYING AUTHORS README TODO ChangeLog @@ -84,5 +146,8 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/kcm_tdealternatives.so %{tde_tdeappdir}/tdealternatives.desktop %{tde_datadir}/apps/tdealternatives/ +%{tde_docdir}/tde/HTML/en/tdealternatives/ %{tde_datadir}/icons/hicolor/*/apps/tdealternatives.png -%{tde_tdedocdir}/HTML/en/tdealternatives/ + + +%changelog diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec index 516b5f03c..74030c1b1 100644 --- a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec @@ -129,7 +129,6 @@ BuildRequires: libacl-devel # DBUS support BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9 -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 # ACL support %if 0%{?mdkver} @@ -141,7 +140,11 @@ BuildRequires: libacl-devel # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %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/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec index 2a464f75f..154333fa0 100644 --- a/redhat/applications/settings/wlassistant/wlassistant.spec +++ b/redhat/applications/settings/wlassistant/wlassistant.spec @@ -82,8 +82,12 @@ BuildRequires: brp-check-trinity BuildRequires: wireless-tools-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mdkversion} +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}iw-devel +%else BuildRequires: %{_lib}iw29-devel %endif +%endif %if 0%{?rhel} == 5 || 0%{?suse_version} BuildRequires: wireless-tools %endif diff --git a/redhat/applications/system/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec index 5452ab3dd..f049eceee 100644 --- a/redhat/applications/system/kbfx/kbfx.spec +++ b/redhat/applications/system/kbfx/kbfx.spec @@ -87,7 +87,12 @@ BuildRequires: libidn-devel BuildRequires: gamin-devel %endif -# PCRE support +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif # ACL support %if 0%{?mdkver} @@ -184,7 +189,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build VERBOSE=1 # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "KBFX Configuration Utility" %{buildroot}%{tde_tdeappdir}/kbfxconfigapp.desktop -r KDE Utility DesktopUtility %suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop %suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop @@ -236,8 +241,8 @@ export PATH="%{tde_bindir}:${PATH}" %lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/kbfxconfigapp.mo %lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo -%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kbfxconfigapp.mo %lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/kbfxconfigapp.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kbfxconfigapp.mo %lang(zh_Hans) %{tde_datadir}/locale/zh_Hans/LC_MESSAGES/kbfxconfigapp.mo %{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop diff --git a/redhat/applications/system/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec index 7b93f6d5c..e19652f9e 100644 --- a/redhat/applications/system/kdbusnotification/kdbusnotification.spec +++ b/redhat/applications/system/kdbusnotification/kdbusnotification.spec @@ -75,7 +75,7 @@ BuildRequires: brp-check-trinity %endif # GTK2 stuff -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gtk+2.0-devel %else BuildRequires: gtk2-devel @@ -153,7 +153,6 @@ fi -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ \ -DWITH_ALL_OPTIONS=ON \ -DWITH_GCC_VISIBILITY=ON \ @@ -186,5 +185,4 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/autostart/kdbusnotification-autostart.desktop - %changelog diff --git a/redhat/applications/system/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec index ab709c0a0..8752c8ead 100644 --- a/redhat/applications/system/krusader/krusader.spec +++ b/redhat/applications/system/krusader/krusader.spec @@ -130,20 +130,24 @@ fi -DCMAKE_SKIP_INSTALL_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \ \ -DWITH_ALL_OPTIONS=ON \ -DWITH_GCC_VISIBILITY=ON \ + \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ -DBUILD_TRANSLATIONS=ON \ \ .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make + %install @@ -154,12 +158,15 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %suse_update_desktop_file "%{buildroot}%{tde_tdeappdir}/krusader.desktop" -r System FileManager %suse_update_desktop_file "%{buildroot}%{tde_tdeappdir}/krusader_root-mode.desktop" -r System FileManager %endif +# Remove unwanted icons +%__rm -fr %{?buildroot}%{tde_datadir}/pixmaps/ + %clean %__rm -rf %{buildroot} @@ -181,7 +188,6 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %{tde_datadir}/apps/tdeconf_update/krusader_lzip_protocols.sh %{tde_datadir}/icons/crystalsvg/*/apps/*.png %{tde_datadir}/icons/locolor/*/apps/*.png -%{tde_datadir}/pixmaps/krusader*.xpm %{tde_datadir}/locale/*/LC_MESSAGES/tdeio_krarc*.mo %{tde_datadir}/locale/*/LC_MESSAGES/tdeio_virt*.mo %{tde_datadir}/services/krarc.protocol @@ -190,6 +196,13 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %{tde_tdedocdir}/HTML/en/krusader/ %{tde_tdedocdir}/HTML/en/tdeioslave/krarc/ %{tde_tdedocdir}/HTML/en/tdeioslave/virt/ +%lang(es) %{tde_datadir}/locale/es_AR/LC_MESSAGES/tdeio_krarc.mo +%lang(es) %{tde_datadir}/locale/es_AR/LC_MESSAGES/tdeio_virt.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/tdeio_krarc.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/tdeio_virt.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/tdeio_krarc.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/tdeio_virt.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/tdeio_virt.mo %lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/ diff --git a/redhat/applications/system/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec index 52d0eb5c1..342b65258 100644 --- a/redhat/applications/system/ksystemlog/ksystemlog.spec +++ b/redhat/applications/system/ksystemlog/ksystemlog.spec @@ -121,7 +121,6 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ diff --git a/redhat/applications/system/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec index 4914c1544..70aceba8f 100644 --- a/redhat/applications/system/kvkbd/kvkbd.spec +++ b/redhat/applications/system/kvkbd/kvkbd.spec @@ -58,6 +58,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -153,7 +155,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{buildroot}%{tde_tdeappdir}/kvkbd.desktop Utility Accessibility %endif diff --git a/redhat/applications/system/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec index 95f256bf6..acb7efbe9 100644 --- a/redhat/applications/system/smartcardauth/smartcardauth.spec +++ b/redhat/applications/system/smartcardauth/smartcardauth.spec @@ -63,10 +63,23 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: trinity-%{tde_pkg}-rpmlintrc BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig +BuildRequires: fdupes + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif # PCSC support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} @@ -87,6 +100,27 @@ BuildRequires: %{_lib}pkcs11-helper-devel BuildRequires: pkcs11-helper-devel %endif +# DB4/DB5 support +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} +%define with_db 1 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: db5-devel +%endif +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +BuildRequires: libdb-devel +BuildRequires: libdb-cxx-devel +%endif +%if 0%{?suse_version} +BuildRequires: libdb-4_8-devel +%endif +%if 0%{?rhel} && 0%{?rhel} <= 6 +BuildRequires: db4-devel +%endif +%endif + +# PAM support +BuildRequires: pam-devel + # TLS support %if 0%{?suse_version} BuildRequires: libgnutls-devel @@ -94,11 +128,8 @@ BuildRequires: libgnutls-devel BuildRequires: gnutls-devel %endif -BuildRequires: libopenssl-devel - -Requires: initramfs-tools -Requires: opensc -Requires: pcsc-lite +# The 'pp' utility +BuildRequires: perl-PAR-Packer %description @@ -174,12 +205,19 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR="%{?buildroot}" -C build +# Debian stuff +%__rm -f %{buildroot}/usr/share/initramfs-tools/hooks/cryptlukssc + + +%clean +%__rm -rf %{buildroot} + + %files %defattr(-,root,root,-) %doc gpl.txt %{_bindir}/cardpincheck %{_bindir}/cryptosmartcard.sh -%{_datadir}/initramfs-tools/hooks/cryptlukssc %changelog diff --git a/redhat/applications/system/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec index 31ba201b5..155871689 100644 --- a/redhat/applications/system/tdepowersave/tdepowersave.spec +++ b/redhat/applications/system/tdepowersave/tdepowersave.spec @@ -60,7 +60,6 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63 BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 BuildRequires: trinity-tde-cmake >= %{tde_version} @@ -83,7 +82,11 @@ BuildRequires: brp-check-trinity %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 @@ -93,7 +96,7 @@ BuildRequires: libudev-devel # Disabled on RHEL4 # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?rhel} == 5 BuildRequires: xorg-x11-proto-devel @@ -264,7 +267,6 @@ fi %lang(en) %{tde_tdedocdir}/HTML/en/tdepowersave/ %lang(fi) %{tde_tdedocdir}/HTML/fi/tdepowersave/ %lang(hu) %{tde_tdedocdir}/HTML/hu/tdepowersave/ -%lang(nb) %dir %{tde_tdedocdir}/HTML/nb %lang(nb) %{tde_tdedocdir}/HTML/nb/tdepowersave/ diff --git a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec index ec2261323..b02013c53 100644 --- a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec +++ b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec @@ -149,7 +149,6 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ diff --git a/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec index f1fb45165..bf96477ac 100644 --- a/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec +++ b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec @@ -196,9 +196,14 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_grey.png %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_white.png %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_yellow.png -%{tde_datadir}/locale/*/LC_MESSAGES/baghira*.mo -%{tde_datadir}/locale/*/LC_MESSAGES/tdestyle_baghira_config.mo -%{tde_datadir}/locale/*/LC_MESSAGES/twin_baghira.mo +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/*.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %{tde_mandir}/man1/bab.1* diff --git a/redhat/applications/themes/tde-style-domino/tde-style-domino.spec b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec index 45d65f608..4ad892590 100644 --- a/redhat/applications/themes/tde-style-domino/tde-style-domino.spec +++ b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec @@ -142,8 +142,14 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/tdedisplay/color-schemes/Domino.kcsrc %{tde_datadir}/apps/tdestyle/themes/domino.themerc %{tde_datadir}/apps/twin/domino.desktop -%{tde_datadir}/locale/*/LC_MESSAGES/tdestyle_domino_config.mo -%{tde_datadir}/locale/*/LC_MESSAGES/twin_domino.mo +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/*.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %changelog diff --git a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec index 969e8761f..1815128c8 100644 --- a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec +++ b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec @@ -72,6 +72,13 @@ BuildRequires: %{_lib}acl-devel BuildRequires: libacl-devel %endif +# GTK2 support +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}gtk+2.0-devel +%else +BuildRequires: gtk2-devel +%endif + # IDN support BuildRequires: libidn-devel @@ -156,7 +163,12 @@ fi %{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.la %{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.so %{_datadir}/themes/Ia* -%{tde_datadir}/locale/*/LC_MESSAGES/twin_iaora.mo +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/*.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %changelog diff --git a/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec index 8bf38ac01..6eb88c816 100644 --- a/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec +++ b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec @@ -121,7 +121,6 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ @@ -139,13 +138,11 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang twin-style-dekorator %clean %__rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc AUTHORS COPYING @@ -155,7 +152,10 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/twin_deKorator_config.so %{tde_datadir}/apps/deKorator/ %{tde_datadir}/apps/twin/deKorator.desktop -%{tde_datadir}/locale/*/LC_MESSAGES/twin-style-dekorator.mo +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %changelog diff --git a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec index 8334a454f..7ccaeabc0 100644 --- a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec +++ b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec @@ -153,7 +153,12 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/twin/fahrenheit/minmax.png %{tde_datadir}/apps/twin/fahrenheit/sticky.png %{tde_datadir}/apps/twin/fahrenheit/unsticky.png -%{tde_datadir}/locale/*/LC_MESSAGES/twin-style-fahrenheit.mo +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/*.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %changelog diff --git a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec index de195232f..a06320e6a 100644 --- a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec +++ b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec @@ -119,7 +119,6 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ @@ -149,6 +148,12 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/twin_MachBunt.so %{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc %{tde_datadir}/apps/twin/MachBunt.desktop -%{tde_datadir}/locale/*/LC_MESSAGES/twin-style-machbunt.mo +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/*.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo + %changelog diff --git a/redhat/applications/themes/twin-style-mallory/twin-style-mallory.spec b/redhat/applications/themes/twin-style-mallory/twin-style-mallory.spec index 0bb6a4616..0ff597342 100644 --- a/redhat/applications/themes/twin-style-mallory/twin-style-mallory.spec +++ b/redhat/applications/themes/twin-style-mallory/twin-style-mallory.spec @@ -1,82 +1,159 @@ # # spec file for package twin-style-mallory (version R14) # -# Copyright (c) 2026 Trinity Desktop Environment packaging contributors +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # +# TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" %define tde_version 14.2.0 %endif %define tde_pkg twin-style-mallory %define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.5 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE window decoration from SUSE 9.3 +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: Mallory TWin style for the Trinity Desktop Environment -Group: System/GUI/Other -URL: http://www.trinitydesktop.org/ -# Upstream CMake comments say GPLv3+, but COPYING and distributed headers -# consistently grant GPLv2-or-later. -License: GPL-2.0-or-later -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tde-cmake >= %{tde_version} -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: gettext +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# SUSE desktop files utility %if 0%{?suse_version} -BuildRequires: libtqt3-mt-devel >= 3.5.0 -BuildRequires: tqt3-dev-tools >= 3.5.0 +BuildRequires: update-desktop-files %endif +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + %description -Mallory window decoration and color schemes for TWin in the Trinity Desktop -Environment. +This is a port of the SUSE 9.3 KDE Window decoration extracted from SUSE. + +It features in additon to the original theme several new button +styles and a changeable titlebar image. + +A color scheme for TDE is provided too. + +########## + +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + %build unset QTDIR QTINC QTLIB -export PATH="%{tde_prefix}/bin:${PATH}" +export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi + %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ -DBUILD_ALL=ON \ - -DBUILD_COLORSCHEMES=ON \ - -DBUILD_TCC_MODULE=ON \ - -DBUILD_TRANSLATIONS=ON -%cmake_build + .. + +%__make %{?_smp_mflags} || %__make + %install -%{__rm} -rf %{buildroot} -%cmake_install -%find_lang %{tde_pkg} +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build -%files -f %{tde_pkg}.lang + +%clean +%__rm -rf %{buildroot} + + +%files %defattr(-,root,root,-) -%{tde_libdir}/trinity/twin_mallory.so -%{tde_libdir}/trinity/twin_mallory.la -%{tde_libdir}/trinity/twin_mallory_config.so -%{tde_libdir}/trinity/twin_mallory_config.la +%doc AUTHORS ChangeLog COPYING README TODO +%{tde_tdelibdir}/twin_mallory.la +%{tde_tdelibdir}/twin_mallory.so +%{tde_tdelibdir}/twin_mallory_config.la +%{tde_tdelibdir}/twin_mallory_config.so +%{tde_datadir}/apps/tdedisplay/color-schemes/Mallory* %{tde_datadir}/apps/twin/mallory.desktop -%{tde_datadir}/apps/tdedisplay/color-schemes/Mallory*.kcsrc +%lang(ia) %{tde_datadir}/locale/ia/LC_MESSAGES/*.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo + %changelog diff --git a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec index ac5984530..7bc705384 100644 --- a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec +++ b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec @@ -136,11 +136,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO %{tde_tdelibdir}/twin_SUSE2.la @@ -150,7 +153,6 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/tdedisplay/color-schemes/SUSE2.kcsrc %{tde_datadir}/apps/twin/SUSE2.desktop %{tde_datadir}/apps/twin/pics/SUSE2/ -%{tde_datadir}/locale/*/LC_MESSAGES/twin-style-suse2.mo %changelog diff --git a/redhat/applications/utilities/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec index eba0ec6bf..65de017d5 100644 --- a/redhat/applications/utilities/abakus/abakus.spec +++ b/redhat/applications/utilities/abakus/abakus.spec @@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/abakus.desktop" Utility Calculator %endif diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec index bae6c6cfc..3a0f7dc25 100644 --- a/redhat/applications/utilities/kbarcode/kbarcode.spec +++ b/redhat/applications/utilities/kbarcode/kbarcode.spec @@ -85,8 +85,12 @@ BuildRequires: %{_lib}openssl-devel BuildRequires: openssl-devel %endif -# PCRE support +# PCRE2 support +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}pcre2-devel +%else BuildRequires: pcre2-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -214,7 +218,7 @@ export PATH="%{tde_bindir}:${PATH}" %__sed -i "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" -e "s|Icon=.*|Icon=kbarcode|" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" Utility PrintingUtility %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-batch.desktop" Utility PrintingUtility %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-editor.desktop" Utility PrintingUtility diff --git a/redhat/applications/utilities/kommando/kommando.spec b/redhat/applications/utilities/kommando/kommando.spec index 94599311e..76b2d08af 100644 --- a/redhat/applications/utilities/kommando/kommando.spec +++ b/redhat/applications/utilities/kommando/kommando.spec @@ -59,19 +59,25 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + # XMU support %if 0%{?suse_version} == 1140 BuildRequires: xorg-x11-libXmu-devel %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210 -BuildRequires: libXmu-devel +BuildRequires: libXmu-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} >= 4 +BuildRequires: %{_lib}xmu-devel +%endif +%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 +BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel %endif - -BuildRequires: desktop-file-utils - -BuildRequires: trinity-tde-cmake >= %{tde_version} -BuildRequires: gcc-c++ -BuildRequires: pkgconfig # SUSE desktop files utility %if 0%{?suse_version} diff --git a/redhat/applications/utilities/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec index 18d333d96..0508e0e43 100644 --- a/redhat/applications/utilities/krename/krename.spec +++ b/redhat/applications/utilities/krename/krename.spec @@ -133,7 +133,6 @@ fi -DWITH_GCC_VISIBILITY=ON \ \ -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index 48689b2f6..f741cdc3e 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -239,6 +239,7 @@ Requires: trinity-twin-style-crystal Requires: trinity-twin-style-dekorator Requires: trinity-twin-style-fahrenheit Requires: trinity-twin-style-machbunt +Requires: trinity-twin-style-mallory Requires: trinity-twin-style-suse2 Requires: trinity-wlassistant Requires: trinity-yakuake -- cgit v1.2.3