diff options
| author | François Andriot <albator78@libertysurf.fr> | 2025-05-01 09:59:59 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2025-05-01 09:59:59 +0200 |
| commit | 19d08f5bf8b704bcf317ab2970ce997c179e0ed2 (patch) | |
| tree | e18ebdf17c8d7e95ceee0a6a6183ef61a7e30220 /redhat/applications | |
| parent | 187788a4af89b20879a0e0b1d2127c67f2312f76 (diff) | |
| download | tde-packaging-19d08f5b.tar.gz tde-packaging-19d08f5b.zip | |
RPM: update for building 14.1.4
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/applications')
131 files changed, 458 insertions, 375 deletions
diff --git a/redhat/applications/development/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec index 9d5d9d766..a9d26e026 100644 --- a/redhat/applications/development/kdbg/kdbg.spec +++ b/redhat/applications/development/kdbg/kdbg.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kdbg %define tde_prefix /opt/trinity @@ -105,7 +105,7 @@ Features include the following: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/development/kdiff3/kdiff3.spec b/redhat/applications/development/kdiff3/kdiff3.spec index 8fe3eb463..67cc2a32c 100644 --- a/redhat/applications/development/kdiff3/kdiff3.spec +++ b/redhat/applications/development/kdiff3/kdiff3.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kdiff3 %define tde_prefix /opt/trinity @@ -98,7 +98,7 @@ Unicode & UTF-8 support ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/development/kpicosim/kpicosim.spec b/redhat/applications/development/kpicosim/kpicosim.spec index 666763abd..24ba5d984 100644 --- a/redhat/applications/development/kpicosim/kpicosim.spec +++ b/redhat/applications/development/kpicosim/kpicosim.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kpicosim %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ simulator and export functions to VHDL, HEX and MEM files. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/development/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec index 76436fcf4..c1f8f27e0 100644 --- a/redhat/applications/development/kscope/kscope.spec +++ b/redhat/applications/development/kscope/kscope.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kscope %define tde_prefix /opt/trinity @@ -113,7 +113,7 @@ Main Features: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/development/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec index 6e07faaec..93bdc0d11 100644 --- a/redhat/applications/development/ktechlab/ktechlab.spec +++ b/redhat/applications/development/ktechlab/ktechlab.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg ktechlab %define tde_prefix /opt/trinity @@ -91,7 +91,7 @@ Homepage: http://ktechlab.org/ ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/development/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec index 722bf7148..3d66d9006 100644 --- a/redhat/applications/development/kxmleditor/kxmleditor.spec +++ b/redhat/applications/development/kxmleditor/kxmleditor.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kxmleditor %define tde_prefix /opt/trinity @@ -102,7 +102,7 @@ Development files for KXMLEditor. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/development/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec index 7d9a9ff0a..7aa506032 100644 --- a/redhat/applications/development/piklab/piklab.spec +++ b/redhat/applications/development/piklab/piklab.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg piklab %define tde_prefix /opt/trinity @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -105,7 +105,7 @@ are supported. A command-line programmer and debugger are also available. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -115,51 +115,47 @@ are supported. A command-line programmer and debugger are also available. %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}" - -# Warning: --enable-final causes FTBFS -# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837 -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --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 + +%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 \ \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ -%if 0%{?rhel} == 5 - --disable-libreadline \ -%endif - -%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 -touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" -%endif + -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_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + .. %__make %{?_smp_mflags} -%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 -touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" -%endif - %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} diff --git a/redhat/applications/development/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec index 83c08ce66..7ee1b4307 100644 --- a/redhat/applications/development/tdesvn/tdesvn.spec +++ b/redhat/applications/development/tdesvn/tdesvn.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdesvn %define tde_prefix /opt/trinity @@ -251,7 +251,7 @@ fi ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/games/knights/knights.spec b/redhat/applications/games/knights/knights.spec index 04900ea48..44a7c4465 100644 --- a/redhat/applications/games/knights/knights.spec +++ b/redhat/applications/games/knights/knights.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg knights %define tde_prefix /opt/trinity @@ -113,7 +113,7 @@ Here's a quick list of Knights' key features: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/games/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec index efadf1bda..1de244389 100644 --- a/redhat/applications/games/tdepacman/tdepacman.spec +++ b/redhat/applications/games/tdepacman/tdepacman.spec @@ -18,7 +18,7 @@ # Default version for this component %define tde_pkg tdepacman %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif # TDE specific building variables diff --git a/redhat/applications/graphics/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec index b5544f11b..3be1a9376 100644 --- a/redhat/applications/graphics/digikam/digikam.spec +++ b/redhat/applications/graphics/digikam/digikam.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg digikam %define tde_prefix /opt/trinity @@ -324,7 +324,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -388,6 +388,9 @@ install -D -m 644 "%{SOURCE1}" "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/ser %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-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec index 0375b7bad..1d7d35f88 100644 --- a/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec +++ b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg gwenview-i18n %define tde_prefix /opt/trinity @@ -97,7 +97,7 @@ KIPI image framework. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec index 5b0b65921..ecd571d7e 100644 --- a/redhat/applications/graphics/gwenview/gwenview.spec +++ b/redhat/applications/graphics/gwenview/gwenview.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg gwenview %define tde_prefix /opt/trinity @@ -116,7 +116,7 @@ KIPI image framework. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/graphics/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec index 9d1b52790..f36105b1f 100644 --- a/redhat/applications/graphics/ksquirrel/ksquirrel.spec +++ b/redhat/applications/graphics/ksquirrel/ksquirrel.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg ksquirrel %define tde_prefix /opt/trinity @@ -107,7 +107,7 @@ OpenGL and dynamic format support. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/graphics/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec index 5c3c98f68..3dadccc2a 100644 --- a/redhat/applications/graphics/potracegui/potracegui.spec +++ b/redhat/applications/graphics/potracegui/potracegui.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg potracegui %define tde_prefix /opt/trinity @@ -102,7 +102,7 @@ remote files (web, ftp, ...) is also supported. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec index e276c0e2e..c1542d124 100644 --- a/redhat/applications/internet/kasablanca/kasablanca.spec +++ b/redhat/applications/internet/kasablanca/kasablanca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kasablanca %define tde_prefix /opt/trinity @@ -95,7 +95,7 @@ BuildRequires: openssl-devel %endif # UTEMPTER support -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1699 BuildRequires: utempter-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} @@ -121,7 +121,7 @@ Kasablanca is an ftp client, among its features are currently: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec index 0714c129f..7da782cde 100644 --- a/redhat/applications/internet/kbiff/kbiff.spec +++ b/redhat/applications/internet/kbiff/kbiff.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kbiff %define tde_prefix /opt/trinity @@ -105,7 +105,7 @@ NNTP mailboxes. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec index 8b58de494..0099768f7 100644 --- a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec +++ b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kftpgrabber %define tde_prefix /opt/trinity @@ -119,7 +119,7 @@ Requires: %{name} = %{version}-%{release} ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec index 6f616ca45..b04bf3f06 100644 --- a/redhat/applications/internet/knmap/knmap.spec +++ b/redhat/applications/internet/knmap/knmap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg knmap %define tde_prefix /opt/trinity @@ -116,7 +116,7 @@ http://www.kde-apps.org/content/show.php?content=31108 ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec index 5c2e23415..5fac3bbb0 100644 --- a/redhat/applications/internet/konversation/konversation.spec +++ b/redhat/applications/internet/konversation/konversation.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg konversation %define tde_prefix /opt/trinity @@ -190,7 +190,7 @@ and experienced users alike will appreciate its many features: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec index 4860fb5ff..88309b15f 100644 --- a/redhat/applications/internet/kopete-otr/kopete-otr.spec +++ b/redhat/applications/internet/kopete-otr/kopete-otr.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kopete-otr %define tde_prefix /opt/trinity @@ -97,7 +97,7 @@ users with IM-Cients supporting the OTR encryption method. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec index dfadbf498..254ef1112 100644 --- a/redhat/applications/internet/kshowmail/kshowmail.spec +++ b/redhat/applications/internet/kshowmail/kshowmail.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kshowmail %define tde_prefix /opt/trinity @@ -101,7 +101,7 @@ All without dragging any messages into your computer. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec index 3a293b04e..3cab0b6c5 100644 --- a/redhat/applications/internet/kstreamripper/kstreamripper.spec +++ b/redhat/applications/internet/kstreamripper/kstreamripper.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kstreamripper %define tde_prefix /opt/trinity @@ -87,7 +87,7 @@ you with managing/ripping your preferred streams. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec index c8835cfe4..406b2fe93 100644 --- a/redhat/applications/internet/ktorrent/ktorrent.spec +++ b/redhat/applications/internet/ktorrent/ktorrent.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg ktorrent %define tde_prefix /opt/trinity @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -112,7 +112,7 @@ enabling background downloading. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -122,43 +122,50 @@ enabling background downloading. %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}" \ - --datadir="%{tde_datadir}" \ - --libdir="%{tde_libdir}" \ - --mandir="%{tde_mandir}" \ - --includedir="%{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_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 \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -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} \ + \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ +%if 0%{?suse_version} == 1699 + -DWITH_BUILTIN_GEOIP=ON \ + -DWITH_SYSTEM_GEOIP=OFF \ +%endif \ - %{?!with_avahi:--without-avahi} + .. +# 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 export PATH="%{tde_bindir}:${PATH}" %__rm -rf "%{buildroot}" -%__make install DESTDIR="%{buildroot}" +%__make install DESTDIR="%{buildroot}" -C build %find_lang %{tde_pkg} @@ -177,7 +184,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_bindir}/ktshell %{tde_bindir}/kttorinfo %{tde_bindir}/ktupnptest -%{tde_libdir}/libktorrent-%{version}.so +%{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 5123178d9..6337d0f1a 100644 --- a/redhat/applications/internet/kvirc/kvirc.spec +++ b/redhat/applications/internet/kvirc/kvirc.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kvirc %define tde_prefix /opt/trinity @@ -124,7 +124,7 @@ with the K Desktop Environment version 3. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -181,7 +181,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make symlinks -C src/kvilib/build %__make symlinks -C src/kvirc/build -%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 || 0%{?mdkver} %__sed -i "src/modules/"*"/Makefile" -e "s|-Wl,--no-undefined||" %endif diff --git a/redhat/applications/internet/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec index e8746613a..4aa66f8af 100644 --- a/redhat/applications/internet/kvpnc/kvpnc.spec +++ b/redhat/applications/internet/kvpnc/kvpnc.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kvpnc %define tde_prefix /opt/trinity @@ -112,7 +112,7 @@ It supports : ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec index 3b44dec32..3f2aab4cb 100644 --- a/redhat/applications/internet/smb4k/smb4k.spec +++ b/redhat/applications/internet/smb4k/smb4k.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg smb4k %define tde_prefix /opt/trinity @@ -136,7 +136,7 @@ Requires: %{name} = %{version}-%{release} ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec index 6b163b725..7245cda0b 100644 --- a/redhat/applications/internet/tork/tork.spec +++ b/redhat/applications/internet/tork/tork.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tork %define tde_prefix /opt/trinity @@ -115,7 +115,7 @@ on the Tor network. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -201,6 +201,8 @@ fi %{tde_datadir}/pixmaps/tork.xpm %{tde_mandir}/man1/tork.1* %{tde_mandir}/man1/torkarkollon.1* -%lang(ru) %{tde_datadir}/locale/ru/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(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %changelog diff --git a/redhat/applications/misc/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec index 81055418f..9be203a0c 100644 --- a/redhat/applications/misc/bibletime/bibletime.spec +++ b/redhat/applications/misc/bibletime/bibletime.spec @@ -23,7 +23,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg bibletime %define tde_prefix /opt/trinity @@ -105,7 +105,7 @@ texts, write own notes, save, print etc.). ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/misc/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec index 0b25f7563..8f6daee6c 100644 --- a/redhat/applications/misc/fusion-icon/fusion-icon.spec +++ b/redhat/applications/misc/fusion-icon/fusion-icon.spec @@ -1,6 +1,6 @@ # Default version for this component %define tde_pkg fusion-icon -%define tde_version 14.1.3 +%define tde_version 14.1.4 %if "%{?python2_sitelib}" == "" %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") diff --git a/redhat/applications/misc/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec index b8c8e19ed..cf5ce74c7 100644 --- a/redhat/applications/misc/kcmldap/kcmldap.spec +++ b/redhat/applications/misc/kcmldap/kcmldap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kcmldap %define tde_prefix /opt/trinity @@ -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 @@ -172,6 +171,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms %dir %{tde_datadir}/pixmaps %{tde_datadir}/pixmaps/kcmldapbonding_step1.png %{tde_datadir}/pixmaps/kcmldapbonding_step3.png +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/kcmldap.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldap.mo ########## @@ -191,7 +191,7 @@ This is a small daemon which keeps the LDAP root certificate up to date with the ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -213,6 +213,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} == 1699 + -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 d6de3ddc9..d5996eb48 100644 --- a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec +++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kcmldapcontroller %define tde_prefix /opt/trinity @@ -183,7 +183,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -209,6 +209,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} == 1699 + -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/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec index ddd28993b..b367a7625 100644 --- a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec +++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kcmldapmanager %define tde_prefix /opt/trinity @@ -169,7 +169,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -190,6 +190,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} == 1699 + -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 cc1a95896..04937d4ef 100644 --- a/redhat/applications/misc/kerberostray/kerberostray.spec +++ b/redhat/applications/misc/kerberostray/kerberostray.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kerberostray %define tde_prefix /opt/trinity @@ -148,7 +148,7 @@ Kerberos ticket manager which sits in the system tray and allows viewing/control ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -169,6 +169,10 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ +%if 0%{?suse_version} == 1699 + -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 b36fa33c9..749692e05 100644 --- a/redhat/applications/misc/krecipes/krecipes.spec +++ b/redhat/applications/misc/krecipes/krecipes.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg krecipes %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ databases. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -151,6 +151,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +for f in %{?buildroot}%{tde_datadir}/locale/*/LC_MESSAGES/%{name}-*.mo; do mv -fv $f ${f%/*}/krecipes.mo; done %find_lang %{tde_pkg} # Fix desktop file location @@ -162,6 +163,9 @@ export PATH="%{tde_bindir}:${PATH}" %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}" diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index 2929abbf7..04c1f0995 100644 --- a/redhat/applications/multimedia/amarok/amarok.spec +++ b/redhat/applications/multimedia/amarok/amarok.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg amarok %define tde_prefix /opt/trinity @@ -98,8 +98,12 @@ BuildRequires: alsa-lib-devel # ESOUND support #BuildRequires: esound-devel -# PCRE support -BuildRequires: pcre-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif # LIBTOOL BuildRequires: libtool @@ -470,7 +474,7 @@ use any of xmms' visualisation plugins with Amarok. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec index 5e521c061..5535d81f5 100644 --- a/redhat/applications/multimedia/codeine/codeine.spec +++ b/redhat/applications/multimedia/codeine/codeine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg codeine %define tde_prefix /opt/trinity @@ -107,7 +107,7 @@ Features: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -150,12 +150,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 diff --git a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec index 1b4675d79..4e7579dbe 100644 --- a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec +++ b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg k3b-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec index 38a308937..86b10e545 100644 --- a/redhat/applications/multimedia/k3b/k3b.spec +++ b/redhat/applications/multimedia/k3b/k3b.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg k3b %define tde_prefix /opt/trinity @@ -464,7 +464,7 @@ and a generic audio and video file converter. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec index b4ab09a5b..743176af6 100644 --- a/redhat/applications/multimedia/k9copy/k9copy.spec +++ b/redhat/applications/multimedia/k9copy/k9copy.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg k9copy %define tde_prefix /opt/trinity @@ -113,7 +113,7 @@ This is the Trinity version. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec index b04bee7ec..28fe7fc02 100644 --- a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec +++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec @@ -19,7 +19,7 @@ %define tde_pkg kaffeine-mozilla %define tde_prefix /opt/trinity %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif # TDE specific building variables diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec index b141a48b8..b14ecd110 100644 --- a/redhat/applications/multimedia/kaffeine/kaffeine.spec +++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kaffeine %define tde_prefix /opt/trinity @@ -291,7 +291,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec index f089da96a..135a4bd69 100644 --- a/redhat/applications/multimedia/kmplayer/kmplayer.spec +++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kmplayer %define tde_prefix /opt/trinity @@ -284,7 +284,7 @@ Development files for KMPlayer, a basic audio/video viewer application for TDE. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/multimedia/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec index 39e58e5d1..8325ea14a 100644 --- a/redhat/applications/multimedia/kplayer/kplayer.spec +++ b/redhat/applications/multimedia/kplayer/kplayer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kplayer %define tde_prefix /opt/trinity @@ -114,7 +114,7 @@ file properties for setting file specific options. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec index ab9995c26..0b6b596a1 100644 --- a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec +++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg mplayerthumbs %define tde_prefix /opt/trinity @@ -102,7 +102,7 @@ is the image, and dropping bad frames. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -170,6 +170,9 @@ fi %{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/ %lang(de) %{tde_datadir}/locale/de/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(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 a83779ca3..c2f34079e 100644 --- a/redhat/applications/multimedia/rosegarden/rosegarden.spec +++ b/redhat/applications/multimedia/rosegarden/rosegarden.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg rosegarden %define tde_prefix /opt/trinity @@ -189,7 +189,7 @@ This package provides the data files necessary for running Rosegarden ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec index df18adfe4..394fccd42 100644 --- a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec +++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg soundkonverter %define tde_prefix /opt/trinity @@ -124,7 +124,7 @@ See the 'trinity-soundkonverter' package for more information. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/multimedia/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec index 25ffc83ca..2c1899459 100644 --- a/redhat/applications/multimedia/tderadio/tderadio.spec +++ b/redhat/applications/multimedia/tderadio/tderadio.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tderadio %define tde_prefix /opt/trinity @@ -142,7 +142,7 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -228,6 +228,7 @@ export PATH="%{tde_bindir}:${PATH}" %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo %lang(es) %{tde_datadir}/locale/es/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 diff --git a/redhat/applications/office/basket/basket.spec b/redhat/applications/office/basket/basket.spec index b73722e11..a5292b68b 100644 --- a/redhat/applications/office/basket/basket.spec +++ b/redhat/applications/office/basket/basket.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg basket %define tde_prefix /opt/trinity @@ -92,7 +92,7 @@ baskets to HTML. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/office/kbibtex/kbibtex.spec b/redhat/applications/office/kbibtex/kbibtex.spec index 12821aea3..158214e2c 100644 --- a/redhat/applications/office/kbibtex/kbibtex.spec +++ b/redhat/applications/office/kbibtex/kbibtex.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kbibtex %define tde_prefix /opt/trinity @@ -112,7 +112,7 @@ KBibTeX is released under the GNU Public License (GPL) version 2 or any later ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/office/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec index 8b3d7a8b0..668aade19 100644 --- a/redhat/applications/office/kbookreader/kbookreader.spec +++ b/redhat/applications/office/kbookreader/kbookreader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kbookreader %define tde_prefix /opt/trinity @@ -101,7 +101,7 @@ within the Trinity Desktop Environment. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/office/keximdb/keximdb.spec b/redhat/applications/office/keximdb/keximdb.spec index 2bb2cb908..173065957 100644 --- a/redhat/applications/office/keximdb/keximdb.spec +++ b/redhat/applications/office/keximdb/keximdb.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg keximdb %define tde_prefix /opt/trinity @@ -108,7 +108,7 @@ directly - they must be converted to a Kexi database first. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/office/kile/kile.spec b/redhat/applications/office/kile/kile.spec index cb2e66d2e..1a3831de4 100644 --- a/redhat/applications/office/kile/kile.spec +++ b/redhat/applications/office/kile/kile.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kile %define tde_prefix /opt/trinity @@ -139,7 +139,7 @@ Kile can support large projects consisting of several smaller files. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/office/kmymoney/kmymoney.spec b/redhat/applications/office/kmymoney/kmymoney.spec index a61cd1274..43039385c 100644 --- a/redhat/applications/office/kmymoney/kmymoney.spec +++ b/redhat/applications/office/kmymoney/kmymoney.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kmymoney %define tde_prefix /opt/trinity @@ -193,7 +193,7 @@ This package contains development files needed for KMyMoney plugins. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/office/knowit/knowit.spec b/redhat/applications/office/knowit/knowit.spec index dddeb4d9e..9cf4c959d 100644 --- a/redhat/applications/office/knowit/knowit.spec +++ b/redhat/applications/office/knowit/knowit.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg knowit %define tde_prefix /opt/trinity @@ -102,7 +102,7 @@ but TDE-based, and requires Trinity. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/office/koffice-i18n/koffice-i18n.spec b/redhat/applications/office/koffice-i18n/koffice-i18n.spec index 3eb696cb6..1ca8705f1 100644 --- a/redhat/applications/office/koffice-i18n/koffice-i18n.spec +++ b/redhat/applications/office/koffice-i18n/koffice-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg koffice-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec index 8e3700d03..47c1dccb6 100644 --- a/redhat/applications/office/koffice/koffice.spec +++ b/redhat/applications/office/koffice/koffice.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg koffice %define tde_prefix /opt/trinity @@ -101,7 +101,6 @@ BuildRequires: brp-check-trinity BuildRequires: fontconfig-devel BuildRequires: libart_lgpl-devel BuildRequires: zlib-devel -BuildRequires: pcre-devel BuildRequires: gettext-devel BuildRequires: mysql-devel BuildRequires: perl @@ -109,6 +108,13 @@ BuildRequires: doxygen BuildRequires: aspell-devel BuildRequires: readline-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif + # EXIF support %if 0%{?mdkver} %if 0%{?pclinuxos} @@ -1140,7 +1146,7 @@ This package is part of the TDE Office Suite. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/office/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec index 3719d4efb..cfaab1cde 100644 --- a/redhat/applications/office/kpilot/kpilot.spec +++ b/redhat/applications/office/kpilot/kpilot.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kpilot %define tde_prefix /opt/trinity @@ -126,7 +126,7 @@ and synchronize the built-in applications with their TDE counterparts. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif 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 548177403..fe2881236 100644 --- a/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec +++ b/redhat/applications/office/tde-ebook-reader/tde-ebook-reader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tde-ebook-reader %define tde_prefix /opt/trinity @@ -193,7 +193,7 @@ of Summary: . ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec index dbaad0cc2..bfe74e656 100644 --- a/redhat/applications/office/tellico/tellico.spec +++ b/redhat/applications/office/tellico/tellico.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tellico %define tde_prefix /opt/trinity @@ -136,8 +136,12 @@ BuildRequires: libexempi-devel BuildRequires: exempi-devel %endif -# PCRE support -BuildRequires: pcre-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif # IDN support BuildRequires: libidn-devel @@ -292,7 +296,7 @@ as a separate package which can be updated through debian-volatile. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/settings/kima/kima.spec b/redhat/applications/settings/kima/kima.spec index 5565798d5..008defd38 100644 --- a/redhat/applications/settings/kima/kima.spec +++ b/redhat/applications/settings/kima/kima.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kima %define tde_prefix /opt/trinity @@ -110,7 +110,7 @@ panel. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/settings/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec index 59c3f32ca..4b41f0ec8 100644 --- a/redhat/applications/settings/kiosktool/kiosktool.spec +++ b/redhat/applications/settings/kiosktool/kiosktool.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kiosktool %define tde_prefix /opt/trinity @@ -104,7 +104,7 @@ groups of users. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/settings/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec index b16c72e5f..149714cf9 100644 --- a/redhat/applications/settings/kkbswitch/kkbswitch.spec +++ b/redhat/applications/settings/kkbswitch/kkbswitch.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kkbswitch %define tde_prefix /opt/trinity @@ -115,7 +115,7 @@ Features include: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/settings/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec index 599e73ed3..3d5a65f1b 100644 --- a/redhat/applications/settings/klcddimmer/klcddimmer.spec +++ b/redhat/applications/settings/klcddimmer/klcddimmer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg klcddimmer %define tde_prefix /opt/trinity @@ -92,7 +92,7 @@ BuildRequires: brp-check-trinity ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec index 83fa6dc5d..c4ce51382 100644 --- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec +++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kmyfirewall %define tde_prefix /opt/trinity @@ -136,7 +136,7 @@ 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 @@ -147,6 +147,10 @@ university etc.) %{tde_datadir}/services/kmf*.desktop %{tde_datadir}/servicetypes/kmf*.desktop %{tde_mandir}/man1/kmyfirewall.1* +%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 ########## @@ -167,7 +171,7 @@ Requires: %{name} = %{version}-%{release} ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -177,40 +181,48 @@ Requires: %{name} = %{version}-%{release} %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 kde_confdir="%{tde_confdir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --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 + +%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} \ + -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} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_DOC=ON \ + -DBUILD_ALL=ON \ + .. -%__make %{?_smp_mflags} +# Not SMP safe ! +%__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE %if 0%{?suse_version} diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index 352fb53ac..c01cd0e4e 100644 --- a/redhat/applications/settings/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tde-guidance %define tde_prefix /opt/trinity @@ -321,7 +321,7 @@ suspend using HAL. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec index b56f76f6b..3c2c768a3 100644 --- a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec +++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tde-systemsettings %define tde_prefix /opt/trinity @@ -95,7 +95,7 @@ Control Centre with an improved user interface. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec index 6beebf289..a0ced6807 100644 --- a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdenetworkmanager %define tde_prefix /opt/trinity @@ -217,7 +217,7 @@ Development headers for tdenetworkmanager ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -267,10 +267,6 @@ fi %suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet %endif -%if 0%{?fedora} >= 43 -%__mv %{?buildroot}/opt/trinity/etc/ %{?buildroot}/etc/ -%endif - %clean %__rm -rf $RPM_BUILD_ROOT diff --git a/redhat/applications/settings/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec index 320dcecb6..23a6eb40a 100644 --- a/redhat/applications/settings/tdesudo/tdesudo.spec +++ b/redhat/applications/settings/tdesudo/tdesudo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdesudo %define tde_prefix /opt/trinity @@ -105,7 +105,7 @@ It allows you to run programs as another user by entering your password. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec index 389e33999..18078908e 100644 --- a/redhat/applications/settings/wlassistant/wlassistant.spec +++ b/redhat/applications/settings/wlassistant/wlassistant.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg wlassistant %define tde_prefix /opt/trinity @@ -130,7 +130,7 @@ remembered so next time the user won't have to enter them again. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec index 14b9f8859..648395e22 100644 --- a/redhat/applications/system/dolphin/dolphin.spec +++ b/redhat/applications/system/dolphin/dolphin.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg dolphin %define tde_prefix /opt/trinity @@ -102,7 +102,7 @@ interface for the task of file management. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/katapult/katapult.spec b/redhat/applications/system/katapult/katapult.spec index 7cb34c443..5364e67bd 100644 --- a/redhat/applications/system/katapult/katapult.spec +++ b/redhat/applications/system/katapult/katapult.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg katapult %define tde_prefix /opt/trinity @@ -102,7 +102,7 @@ inspired by Quicksilver for OS X. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec index 04569ac72..48d7811fd 100644 --- a/redhat/applications/system/kbfx/kbfx.spec +++ b/redhat/applications/system/kbfx/kbfx.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kbfx %define tde_prefix /opt/trinity @@ -87,8 +87,12 @@ BuildRequires: libidn-devel BuildRequires: gamin-devel %endif -# PCRE support -BuildRequires: pcre-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif # ACL support %if 0%{?mdkver} @@ -118,7 +122,7 @@ Homepage: http://www.kbfx.org ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -237,6 +241,7 @@ export PATH="%{tde_bindir}:${PATH}" %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(zh_Hans) %{tde_datadir}//locale/zh_Hans/LC_MESSAGES/kbfxconfigapp.mo %{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop diff --git a/redhat/applications/system/kcmautostart/kcmautostart.spec b/redhat/applications/system/kcmautostart/kcmautostart.spec index 66bcf81ac..e1be1cf08 100644 --- a/redhat/applications/system/kcmautostart/kcmautostart.spec +++ b/redhat/applications/system/kcmautostart/kcmautostart.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kcmautostart %define tde_prefix /opt/trinity @@ -101,7 +101,7 @@ Requires: trinity-tdebase >= %{tde_version} ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec index 5692d7df0..3fdbedaa2 100644 --- a/redhat/applications/system/kdbusnotification/kdbusnotification.spec +++ b/redhat/applications/system/kdbusnotification/kdbusnotification.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kdbusnotification %define tde_prefix /opt/trinity @@ -113,7 +113,7 @@ DBUS notifications via unobtrusive, easily dismissed passive popups. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -183,6 +183,9 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %{tde_bindir}/notification-daemon-tde %{tde_datadir}/autostart/kdbusnotification-autostart.desktop +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/notification-daemon-tde.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/notification-daemon-tde.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/notification-daemon-tde.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/notification-daemon-tde.mo diff --git a/redhat/applications/system/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec index 9c57102a4..441673249 100644 --- a/redhat/applications/system/klamav/klamav.spec +++ b/redhat/applications/system/klamav/klamav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg klamav %define tde_prefix /opt/trinity @@ -93,7 +93,7 @@ BuildRequires: openssl-devel %description A TDE front-end for the Clam AntiVirus antivirus toolkit. -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/knemo/knemo.spec b/redhat/applications/system/knemo/knemo.spec index 85f9290fa..93f583e7a 100644 --- a/redhat/applications/system/knemo/knemo.spec +++ b/redhat/applications/system/knemo/knemo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg knemo %define tde_prefix /opt/trinity @@ -142,7 +142,7 @@ Homepage: http://extragear.kde.org/apps/knemo/ ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/knetload/knetload.spec b/redhat/applications/system/knetload/knetload.spec index d6ef0c47d..96bfd45ed 100644 --- a/redhat/applications/system/knetload/knetload.spec +++ b/redhat/applications/system/knetload/knetload.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg knetload %define tde_prefix /opt/trinity @@ -106,7 +106,7 @@ KNetLoad can monitor just about any network device. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/knetstats/knetstats.spec b/redhat/applications/system/knetstats/knetstats.spec index d53d39a63..89b7bb713 100644 --- a/redhat/applications/system/knetstats/knetstats.spec +++ b/redhat/applications/system/knetstats/knetstats.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg knetstats %define tde_prefix /opt/trinity @@ -101,7 +101,7 @@ network interface on a system tray icon ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/kooldock/kooldock.spec b/redhat/applications/system/kooldock/kooldock.spec index ebf0babcf..24902487a 100644 --- a/redhat/applications/system/kooldock/kooldock.spec +++ b/redhat/applications/system/kooldock/kooldock.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kooldock %define tde_prefix /opt/trinity @@ -111,7 +111,7 @@ Homepage: http://sourceforge.net/projects/kooldock/ ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec index 63daa7b8d..847ac5346 100644 --- a/redhat/applications/system/krusader/krusader.spec +++ b/redhat/applications/system/krusader/krusader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg krusader %define tde_prefix /opt/trinity @@ -99,7 +99,7 @@ great on your desktop. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec index dc96e8383..4f1647c81 100644 --- a/redhat/applications/system/kshutdown/kshutdown.spec +++ b/redhat/applications/system/kshutdown/kshutdown.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kshutdown %define tde_prefix /opt/trinity @@ -107,7 +107,7 @@ and sounds. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec index 39c47669b..7696f360a 100644 --- a/redhat/applications/system/ksystemlog/ksystemlog.spec +++ b/redhat/applications/system/ksystemlog/ksystemlog.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg ksystemlog %define tde_prefix /opt/trinity @@ -87,7 +87,7 @@ quickly see problems occuring on their server. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec index 1933d7b1c..22f52c17b 100644 --- a/redhat/applications/system/kvkbd/kvkbd.spec +++ b/redhat/applications/system/kvkbd/kvkbd.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kvkbd %define tde_prefix /opt/trinity @@ -100,7 +100,7 @@ a systray widget as well as a dockwidget. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec index d3e5c970e..693f1f064 100644 --- a/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec +++ b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg polkit-agent-tde %define tde_prefix /opt/trinity @@ -75,7 +75,7 @@ PolicyKit-agent-tde provides a D-Bus session bus service that is used to bring up authentication dialogs used for obtaining privileges. -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec index 05aecf32b..e807face8 100644 --- a/redhat/applications/system/smartcardauth/smartcardauth.spec +++ b/redhat/applications/system/smartcardauth/smartcardauth.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg smartcardauth %define tde_prefix /opt/trinity @@ -149,7 +149,7 @@ in addition to the PKCS certificate functionality ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/tastymenu/tastymenu.spec b/redhat/applications/system/tastymenu/tastymenu.spec index 0f424f19c..7090e089d 100644 --- a/redhat/applications/system/tastymenu/tastymenu.spec +++ b/redhat/applications/system/tastymenu/tastymenu.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tastymenu %define tde_prefix /opt/trinity @@ -100,7 +100,7 @@ Tasty Menu is a TMenu replacement aiming to provide the maximum usability and fl ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/tdebluez/tdebluez.spec b/redhat/applications/system/tdebluez/tdebluez.spec index f33517e7f..b89642529 100644 --- a/redhat/applications/system/tdebluez/tdebluez.spec +++ b/redhat/applications/system/tdebluez/tdebluez.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdebluez %define tde_prefix /opt/trinity @@ -197,7 +197,7 @@ See the 'trinity-tdebluez' package for more informations. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -250,10 +250,6 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} -%if 0%{?fedora} >= 43 -%__mv %{?buildroot}/opt/trinity/etc/ %{?buildroot}/etc/ -%endif - %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/system/tdedocker/tdedocker.spec b/redhat/applications/system/tdedocker/tdedocker.spec index 3f135f43d..d56c73e1b 100644 --- a/redhat/applications/system/tdedocker/tdedocker.spec +++ b/redhat/applications/system/tdedocker/tdedocker.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdedocker %define tde_prefix /opt/trinity @@ -132,7 +132,7 @@ and many more. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec index 2056b32ac..4af8a839e 100644 --- a/redhat/applications/system/tdepowersave/tdepowersave.spec +++ b/redhat/applications/system/tdepowersave/tdepowersave.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdepowersave %define tde_prefix /opt/trinity @@ -179,7 +179,7 @@ settings for: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec index 737b69d36..fe4876756 100644 --- a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec +++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdesshaskpass %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ A TDE version of ssh-askpass with TDEWallet support. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/system/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec index de683456a..6b638cddc 100644 --- a/redhat/applications/system/yakuake/yakuake.spec +++ b/redhat/applications/system/yakuake/yakuake.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg yakuake %define tde_prefix /opt/trinity @@ -98,7 +98,7 @@ Yakuake is a Quake-style terminal emulator based on TDE Konsole technology. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec index 5fd2f83cb..12725cf80 100644 --- a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec +++ b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdeio-appinfo %define tde_prefix /opt/trinity @@ -102,7 +102,7 @@ This enables you to perform appinfo: searches in TDE. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -164,6 +164,10 @@ fi %{tde_tdelibdir}/tdeio_appinfo.la %{tde_tdelibdir}/tdeio_appinfo.so %{tde_datadir}/services/appinfo.protocol +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/tdeio_appinfo.mo +%lang(ka) %{tde_datadir}/locale/ka/LC_MESSAGES/tdeio_appinfo.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/tdeio_appinfo.mo +%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/tdeio_appinfo.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/tdeio_appinfo.mo diff --git a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec index 4bcfd0847..5f2bdb681 100644 --- a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec +++ b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdeio-apt %define tde_prefix /opt/trinity @@ -98,7 +98,7 @@ browsing the packages easier. It provides: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec index 09d230d94..9986a073d 100644 --- a/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec +++ b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdeio-ftps %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ most server implementations. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec index 18305127a..382d3914c 100644 --- a/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec +++ b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdeio-gopher %define tde_prefix /opt/trinity @@ -95,7 +95,7 @@ This enables you to perform gopher searches in Konqueror. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec index 1b5162e7a..48c64c00f 100644 --- a/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec +++ b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdeio-locate %define tde_prefix /opt/trinity @@ -115,7 +115,7 @@ as a directory. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec index e5bb575cd..ef9e5258e 100644 --- a/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec +++ b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec @@ -23,7 +23,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdeio-sword %define tde_prefix /opt/trinity @@ -113,7 +113,7 @@ ioslave, providing the sword:/ protocol. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec index bfbc35a01..1b5891279 100644 --- a/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec +++ b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdeio-umountwrapper %define tde_prefix /opt/trinity @@ -105,7 +105,7 @@ Provides a progress dialog for Safely Removing of devices in Trinity. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec index 9b756a0c0..43d96bfb9 100644 --- a/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec +++ b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg gtk-qt-engine %define tde_prefix /opt/trinity @@ -110,7 +110,7 @@ a way to configure it from within KControl. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif 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 c6f07f0eb..49f9915a8 100644 --- a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec +++ b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg gtk3-tqt-engine %define tde_prefix /opt/trinity @@ -116,7 +116,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec index a542807e9..b1072adbb 100644 --- a/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec +++ b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kgtk-qt3 %define tde_prefix /opt/trinity @@ -125,7 +125,7 @@ This package includes the kqt3-wrapper ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec index f641c7923..e4c0e3d0e 100644 --- a/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec +++ b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg ksplash-engine-moodin %define tde_prefix /opt/trinity @@ -107,7 +107,7 @@ Homepage: http://moodwrod.com ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec index bccf63375..3250b0ea3 100644 --- a/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec +++ b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg qt4-tqt-theme-engine %define tde_prefix /opt/trinity @@ -97,7 +97,7 @@ TDE theme engine for Qt4 ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif 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 97df070c5..58bcf6e79 100644 --- a/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec +++ b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tde-style-baghira %define tde_prefix /opt/trinity @@ -88,7 +88,7 @@ Baghira (panther, in german) makes TDE resemble Apple's MacOS X's Aqua, Panther and Jaguar looks, and also includes its own 'Baghira' look -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -196,11 +196,13 @@ 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 -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/baghira-starter.mo -%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/baghira-usermanager.mo -%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/baghira-usermanager.mo -%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/baghira-kmenuapplet.mo -%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/baghira-switcher.mo +%lang(de) %{tde_datadir}/locale/de/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 af4c8ab97..825133991 100644 --- a/redhat/applications/themes/tde-style-domino/tde-style-domino.spec +++ b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tde-style-domino %define tde_prefix /opt/trinity @@ -84,7 +84,7 @@ Domino is a style with a soft look. It allows to fine adjust the shininess of the widgets by customizable color gradients. -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -142,7 +142,11 @@ 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 -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/tdestyle_domino_config.mo +%lang(de) %{tde_datadir}/locale/de/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 %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 b0c9b60d0..7d7f64183 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 @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tde-style-ia-ora %define tde_prefix /opt/trinity @@ -97,7 +97,7 @@ Provides: trinity-style-ia-ora = %{?epoch:%{epoch}:}%{version}-%{release} %description Mandriva theme for Trinity -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -163,7 +163,10 @@ 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* -%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin_iaora.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(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %changelog diff --git a/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec index 90bf4d437..434e5ef6d 100644 --- a/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec +++ b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tde-style-lipstik %define tde_prefix /opt/trinity @@ -100,7 +100,7 @@ Lipstik also provides Lipstik-color-schemes ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec index 5bd3ba294..fa5454887 100644 --- a/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec +++ b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tde-style-polyester %define tde_prefix /opt/trinity @@ -84,7 +84,7 @@ Domino is a style with a soft look. It allows to fine adjust the shininess of the widgets by customizable color gradients. -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec index 0c8a2be89..f090b2ae4 100644 --- a/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec +++ b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tde-style-qtcurve %define tde_prefix /opt/trinity @@ -118,7 +118,7 @@ gtk2-engines-qtcurve. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/themes/tdmtheme/tdmtheme.spec b/redhat/applications/themes/tdmtheme/tdmtheme.spec index 061490dbb..f7f03201a 100644 --- a/redhat/applications/themes/tdmtheme/tdmtheme.spec +++ b/redhat/applications/themes/tdmtheme/tdmtheme.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdmtheme %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ that allows you to easily install, remove and change your TDM themes. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec index b00a857ac..630461d79 100644 --- a/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec +++ b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg twin-style-crystal %define tde_prefix /opt/trinity @@ -91,7 +91,7 @@ And it is of course nice to look at. Upstream says: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif 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 57f409393..dfcfa8ab3 100644 --- a/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec +++ b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg twin-style-dekorator %define tde_prefix /opt/trinity @@ -88,7 +88,7 @@ And it is of course nice to look at. Upstream says: ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -154,6 +154,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/twin_deKorator_config.so %{tde_datadir}/apps/deKorator/ %{tde_datadir}/apps/twin/deKorator.desktop +%lang(nl) %{tde_datadir}/locale/nl/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 4125b0989..904223021 100644 --- a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec +++ b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg twin-style-fahrenheit %define tde_prefix /opt/trinity @@ -87,7 +87,7 @@ A color scheme for TDE is provided too. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -153,7 +153,10 @@ 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 -%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin-style-fahrenheit.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(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 ef1f31f47..900bb506c 100644 --- a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec +++ b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg twin-style-machbunt %define tde_prefix /opt/trinity @@ -85,7 +85,7 @@ An example color scheme is provided too. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -149,6 +149,9 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/twin3_MachBunt.so %{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc %{tde_datadir}/apps/twin/MachBunt.desktop +%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(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/twin-style-machbunt.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 77192b4ed..01526d34e 100644 --- a/redhat/applications/themes/twin-style-mallory/twin-style-mallory.spec +++ b/redhat/applications/themes/twin-style-mallory/twin-style-mallory.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg twin-style-mallory %define tde_prefix /opt/trinity @@ -87,7 +87,7 @@ A color scheme for TDE is provided too. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -147,6 +147,10 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/twin_mallory_config.so %{tde_datadir}/apps/tdedisplay/color-schemes/Mallory* %{tde_datadir}/apps/twin/mallory.desktop +%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 %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 a6040fb9e..fa18a3075 100644 --- a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec +++ b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg twin-style-suse2 %define tde_prefix /opt/trinity @@ -87,7 +87,7 @@ A color scheme for TDE is provided too. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec index 595861038..636ba5f6b 100644 --- a/redhat/applications/utilities/abakus/abakus.spec +++ b/redhat/applications/utilities/abakus/abakus.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg abakus %define tde_prefix /opt/trinity @@ -110,7 +110,7 @@ It also gives information about mathematical variables and has the user-friendly menu options of a normal TDE application. -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/filelight/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec index 323d41336..b6c9ec19d 100644 --- a/redhat/applications/utilities/filelight/filelight.spec +++ b/redhat/applications/utilities/filelight/filelight.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg filelight %define tde_prefix /opt/trinity @@ -116,7 +116,7 @@ directories on your computer. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec index 55d001e5e..b59b70835 100644 --- a/redhat/applications/utilities/kbarcode/kbarcode.spec +++ b/redhat/applications/utilities/kbarcode/kbarcode.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kbarcode %define tde_prefix /opt/trinity @@ -85,9 +85,6 @@ BuildRequires: %{_lib}openssl-devel BuildRequires: openssl-devel %endif -# PCRE support -BuildRequires: pcre-devel - # PCRE2 support %if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}pcre2-devel @@ -163,7 +160,7 @@ Group: Applications/Utilities ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/kchmviewer/kchmviewer.spec b/redhat/applications/utilities/kchmviewer/kchmviewer.spec index 86b45a6ce..ae46ada21 100644 --- a/redhat/applications/utilities/kchmviewer/kchmviewer.spec +++ b/redhat/applications/utilities/kchmviewer/kchmviewer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kchmviewer %define tde_prefix /opt/trinity @@ -123,7 +123,7 @@ support. Correctly detects and shows encoding of any valid chm file. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec index 94ffe796b..15466b6ee 100644 --- a/redhat/applications/utilities/kcpuload/kcpuload.spec +++ b/redhat/applications/utilities/kcpuload/kcpuload.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kcpuload %define tde_prefix /opt/trinity @@ -98,7 +98,7 @@ KCPULoad has support for SMP and separate user/system loads. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/kdirstat/kdirstat.spec b/redhat/applications/utilities/kdirstat/kdirstat.spec index 2cdcbccf6..d2dfdb333 100644 --- a/redhat/applications/utilities/kdirstat/kdirstat.spec +++ b/redhat/applications/utilities/kdirstat/kdirstat.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kdirstat %define tde_prefix /opt/trinity @@ -107,7 +107,7 @@ own cleanup actions. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec index a33fb16b0..371bea26b 100644 --- a/redhat/applications/utilities/keep/keep.spec +++ b/redhat/applications/utilities/keep/keep.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg keep %define tde_prefix /opt/trinity @@ -106,7 +106,7 @@ Homepage: http://jr.falleri.free.fr/keep ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec index ee4aee8e9..c226eeeb0 100644 --- a/redhat/applications/utilities/knutclient/knutclient.spec +++ b/redhat/applications/utilities/knutclient/knutclient.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg knutclient %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ stations using an UPS. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/kommando/kommando.spec b/redhat/applications/utilities/kommando/kommando.spec index 947a2a762..eb68f76fa 100644 --- a/redhat/applications/utilities/kommando/kommando.spec +++ b/redhat/applications/utilities/kommando/kommando.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kommando %define tde_prefix /opt/trinity @@ -98,7 +98,7 @@ It also gives information about mathematical variables and has the user-friendly menu options of a normal TDE application. -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -152,12 +152,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{?buildroot}%{tde_libdir}/libkommando.la %__rm -f %{?buildroot}%{tde_libdir}/libkommando.so +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_datadir}/icons/hicolor/*/apps/kommando.png diff --git a/redhat/applications/utilities/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec index b8ce5616d..6bafb034c 100644 --- a/redhat/applications/utilities/kompose/kompose.spec +++ b/redhat/applications/utilities/kompose/kompose.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg kompose %define tde_prefix /opt/trinity @@ -90,7 +90,7 @@ Kompose creates a full-screen view in which every window is represented by a scaled screen shot of it. It appears as a panel applet. -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec index 45970f28a..d6b5d9442 100644 --- a/redhat/applications/utilities/krename/krename.spec +++ b/redhat/applications/utilities/krename/krename.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg krename %define tde_prefix /opt/trinity @@ -101,7 +101,7 @@ or Exif informations of an image. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec index af33e3820..214bd0add 100644 --- a/redhat/applications/utilities/ksensors/ksensors.spec +++ b/redhat/applications/utilities/ksensors/ksensors.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg ksensors %define tde_prefix /opt/trinity @@ -104,7 +104,7 @@ temperatures with KSensors. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec index 85ca878ac..2c7cba4d6 100644 --- a/redhat/applications/utilities/mathemagics/mathemagics.spec +++ b/redhat/applications/utilities/mathemagics/mathemagics.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg mathemagics %define tde_prefix /opt/trinity @@ -68,7 +68,7 @@ BuildRequires: libtool %description Mathemagics is a RPN Calculator. -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec index c742bed1c..f695029a0 100644 --- a/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg qalculate-tde %define tde_prefix /opt/trinity @@ -104,7 +104,7 @@ This package contains the TDE user interface of qalculate. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif |