diff options
Diffstat (limited to 'redhat/core')
23 files changed, 114 insertions, 72 deletions
diff --git a/redhat/core/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec index 21c7b6a55..0ad0405bf 100644 --- a/redhat/core/tde-i18n/tde-i18n.spec +++ b/redhat/core/tde-i18n/tde-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 tde-i18n %define tde_prefix /opt/trinity diff --git a/redhat/core/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec index 7d0313659..a4aa14850 100644 --- a/redhat/core/tdeaccessibility/tdeaccessibility.spec +++ b/redhat/core/tdeaccessibility/tdeaccessibility.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 tdeaccessibility %define tde_prefix /opt/trinity @@ -433,7 +433,7 @@ programs. ########## -%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/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec index bf192bb54..3ace7fea1 100644 --- a/redhat/core/tdeaddons/tdeaddons.spec +++ b/redhat/core/tdeaddons/tdeaddons.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdeaddons %define tde_prefix /opt/trinity @@ -117,10 +117,11 @@ BuildRequires: libidn-devel BuildRequires: gamin-devel %endif -# PCRE support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_pcre 1 -BuildRequires: pcre-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel %endif # ACL support @@ -686,7 +687,7 @@ of user interfaces, playlists and visualisation 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/core/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec index e4b958cb5..26dbd84d2 100644 --- a/redhat/core/tdeadmin/tdeadmin.spec +++ b/redhat/core/tdeadmin/tdeadmin.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 tdeadmin %define tde_prefix /opt/trinity @@ -345,7 +345,7 @@ touch /etc/lilo.conf ########## -%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/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec index 7e07ac58b..fcd26df2d 100644 --- a/redhat/core/tdeartwork/tdeartwork.spec +++ b/redhat/core/tdeartwork/tdeartwork.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 tdeartwork %define tde_prefix /opt/trinity @@ -728,7 +728,7 @@ This package is part of Trinity, and a component of the TDE artwork module. ########## -%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/core/tdebase/pamd.kcheckpass-trinity.pclos2025 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2025 new file mode 120000 index 000000000..ad0fc6da6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2025 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.pclos2018
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2025 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2025 new file mode 120000 index 000000000..5cde6e2c5 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2025 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.pclos2018
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.pclos2025 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2025 new file mode 120000 index 000000000..fcc6957f7 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2025 @@ -0,0 +1 @@ +pamd.kdm-trinity.pclos2018
\ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2025 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2025 new file mode 120000 index 000000000..31d43e302 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2025 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.pclos2018
\ No newline at end of file diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec index ffb1728dc..4ba904b61 100644 --- a/redhat/core/tdebase/tdebase.spec +++ b/redhat/core/tdebase/tdebase.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 tdebase %define tde_prefix /opt/trinity @@ -203,7 +203,7 @@ Requires: mandriva-theme %endif # OpenMandriva -%if 0%{?mdkver} >= 5000000 +%if 0%{?mdkver} Requires: distro-release-theme %define tde_bg /usr/share/wallpapers/default.png %endif @@ -244,8 +244,10 @@ BuildRequires: htdig # OPENSSL support %if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}openssl-devel +Requires: %{_lib}ssl3 %else BuildRequires: openssl-devel +Requires: openssl %endif # AUDIOFILE support @@ -281,7 +283,9 @@ BuildRequires: %{libvorbis_devel} BuildRequires: glib2-devel # PCRE support +%if 0%{?suse_version} == 0 BuildRequires: pcre-devel +%endif # PCRE2 support %if 0%{?mdkver} >= 5000000 @@ -705,7 +709,6 @@ Requires: %{name}-tdeio-smb-plugin = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-arts >= %{tde_epoch}:1.5.10 Requires: trinity-tdelibs >= %{tde_version} -Requires: openssl # RHEL 6 Configuration files are provided in separate packages @@ -3248,7 +3251,7 @@ Windows and Samba shares. ########## -%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/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec index 475722be0..6ee4ee126 100644 --- a/redhat/core/tdebindings/tdebindings.spec +++ b/redhat/core/tdebindings/tdebindings.spec @@ -27,7 +27,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 tdebindings %define tde_prefix /opt/trinity @@ -1069,7 +1069,7 @@ This package contains the development files for the TDE bindings. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -1193,6 +1193,12 @@ if grep "LIBPYTHON=''" "config.log"; then exit 1 fi +%if 0%{?mdkver} +# Something weird in openmandriva autotools: +# we need to update generated files timestamps to avoid autotools infinite loop +touch subdirs acinclude.m4 aclocal.m4 Makefile.am Makefile.in Makefile configure config.status +%endif + # Build dcopperl with specific options pushd dcopperl CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3 diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec index c4214bb66..f5f690a6d 100644 --- a/redhat/core/tdeedu/tdeedu.spec +++ b/redhat/core/tdeedu/tdeedu.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 tdeedu %define tde_prefix /opt/trinity @@ -1144,7 +1144,7 @@ This package contains the development files for tdeedu. ########## -%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/core/tdegames/tdegames.spec b/redhat/core/tdegames/tdegames.spec index 1289122bb..7a7a4dbe4 100644 --- a/redhat/core/tdegames/tdegames.spec +++ b/redhat/core/tdegames/tdegames.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 tdegames %define tde_prefix /opt/trinity @@ -1175,7 +1175,7 @@ This package is part of Trinity, and a component of the TDE games module. ########## -%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/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec index 79d6d9f7f..17caa2150 100644 --- a/redhat/core/tdegraphics/tdegraphics.spec +++ b/redhat/core/tdegraphics/tdegraphics.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 tdegraphics %define tde_prefix /opt/trinity @@ -108,8 +108,12 @@ BuildRequires: %{_lib}tiff-devel BuildRequires: libtiff-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} @@ -1054,7 +1058,7 @@ applications against tdegraphics libraries. ########## -%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/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec index 077803e7b..74595c84b 100644 --- a/redhat/core/tdelibs/tdelibs.spec +++ b/redhat/core/tdelibs/tdelibs.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 tdelibs %define tde_prefix /opt/trinity @@ -170,7 +170,7 @@ BuildRequires: gamin-devel %endif # PCRE support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define with_pcre 1 %if 0%{?mgaversion} >= 9 BuildRequires: %{_lib}pcre-devel @@ -203,15 +203,19 @@ BuildRequires: bzip2-devel # UTEMPTER support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%define with_utempter 1 BuildRequires: %{_lib}utempter-devel %endif %if 0%{?rhel} >=5 || 0%{?fedora} +%define with_utempter 1 BuildRequires: libutempter-devel %endif %if 0%{?rhel} == 4 +%define with_utempter 1 BuildRequires: utempter %endif -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1699 +%define with_utempter 1 BuildRequires: utempter-devel %endif @@ -693,7 +697,7 @@ applications for TDE. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -757,7 +761,7 @@ fi -DWITH_TIFF=ON \ %{?!with_jasper:-DWITH_JASPER=OFF} \ %{?!with_openexr:-DWITH_OPENEXR=OFF} \ - -DWITH_UTEMPTER=ON \ + %{?!with_utempter:-DWITH_UTEMPTER=OFF} \ %{?!with_avahi:-DWITH_AVAHI=OFF} \ %{?!with_elficon:-DWITH_ELFICON=OFF} \ %{?!with_pcre:-DWITH_PCRE=OFF} \ @@ -822,9 +826,6 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit" %__rm -f "%{?buildroot}%{tde_bindir}/filesharelist" %__rm -f "%{?buildroot}%{tde_bindir}/fileshareset" -%if 0%{?fedora} >= 43 -%__mv %{?buildroot}/opt/trinity/etc/xdg/ %{?buildroot}/etc/ -%endif %clean %__rm -rf "%{?buildroot}" diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec index 8cad7c88f..5fd5a7b47 100644 --- a/redhat/core/tdemultimedia/tdemultimedia.spec +++ b/redhat/core/tdemultimedia/tdemultimedia.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 tdemultimedia %define tde_prefix /opt/trinity @@ -594,6 +594,8 @@ au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity. %{tde_tdelibdir}/tdefile_m3u.so %{tde_tdelibdir}/tdefile_mp3.la %{tde_tdelibdir}/tdefile_mp3.so +%{tde_tdelibdir}/tdefile_mp4.la +%{tde_tdelibdir}/tdefile_mp4.so %{tde_tdelibdir}/tdefile_mpc.la %{tde_tdelibdir}/tdefile_mpc.so %{tde_tdelibdir}/tdefile_mpeg.la @@ -611,6 +613,7 @@ au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity. %{tde_datadir}/services/tdefile_flac.desktop %{tde_datadir}/services/tdefile_m3u.desktop %{tde_datadir}/services/tdefile_mp3.desktop +%{tde_datadir}/services/tdefile_mp4.desktop %{tde_datadir}/services/tdefile_mpc.desktop %{tde_datadir}/services/tdefile_mpeg.desktop %{tde_datadir}/services/tdefile_ogg.desktop @@ -1104,7 +1107,7 @@ noatun plugins. ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -1207,10 +1210,6 @@ export PATH="%{tde_bindir}:${PATH}" # Links duplicate files %fdupes "%{?buildroot}%{tde_datadir}" -%if 0%{?fedora} >= 43 -%__mv %{?buildroot}/opt/trinity/etc/ %{?buildroot}/etc/ -%endif - %clean %__rm -rf %{buildroot} diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec index 74d54fe95..b40e1595c 100644 --- a/redhat/core/tdenetwork/tdenetwork.spec +++ b/redhat/core/tdenetwork/tdenetwork.spec @@ -26,7 +26,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 tdenetwork %define tde_prefix /opt/trinity @@ -140,8 +140,12 @@ BuildRequires: libgadu-devel %endif %endif -# PCRE support -BuildRequires: pcre-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif # GAMIN support # Not on openSUSE. @@ -1094,7 +1098,7 @@ A tdeioslave and tded module that provide Zeroconf support. Try ########## -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -1253,10 +1257,6 @@ done # Links duplicate files %fdupes "%{?buildroot}%{tde_datadir}" -%if 0%{?fedora} >= 43 -%__mv %{?buildroot}/usr/etc/ppp/ %{?buildroot}/etc/ -%endif - %clean %__rm -rf %{buildroot} diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec index 85536c928..60153a589 100644 --- a/redhat/core/tdepim/tdepim.spec +++ b/redhat/core/tdepim/tdepim.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 tdepim %define tde_prefix /opt/trinity @@ -77,9 +77,15 @@ BuildRequires: make BuildRequires: gpgme-devel BuildRequires: flex BuildRequires: boost-devel -BuildRequires: pcre-devel BuildRequires: libidn-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif + # ICAL support %if 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: %{_lib}ical-devel @@ -1848,7 +1854,7 @@ dialing calls, phonebook, and phone status monitoring. ########## -%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/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec index 44797b209..aab12da8e 100644 --- a/redhat/core/tdesdk/tdesdk.spec +++ b/redhat/core/tdesdk/tdesdk.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 tdesdk %define tde_prefix /opt/trinity @@ -96,8 +96,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 # for kbugbuster/libkcal BuildRequires: desktop-file-utils @@ -118,6 +122,9 @@ BuildRequires: db4-devel BuildRequires: libdb-4_8-devel %endif %endif +%if 0%{?mdkver} +BuildRequires: lib64db5.3-devel +%endif # kbabel, F-7+: flex >= 2.5.33-9 BuildRequires: flex @@ -1084,7 +1091,7 @@ This package contains the development files for tdesdk. ########## -%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/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec index ed6a5681c..fb358a9da 100644 --- a/redhat/core/tdetoys/tdetoys.spec +++ b/redhat/core/tdetoys/tdetoys.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdetoys %define tde_prefix /opt/trinity @@ -99,8 +99,12 @@ BuildRequires: %{_lib}acl-devel BuildRequires: libacl-devel %endif -# PCRE support -BuildRequires: pcre-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif # OPENSSL support %if 0%{?mdkver} @@ -393,7 +397,7 @@ This package is part of Trinity, and a component of the TDE toys module. ########## -%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/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec index bff3ac7d7..b54faa8fe 100644 --- a/redhat/core/tdeutils/tdeutils.spec +++ b/redhat/core/tdeutils/tdeutils.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.3 +%define tde_version 14.1.4 %endif %define tde_pkg tdeutils %define tde_prefix /opt/trinity @@ -126,8 +126,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 # XMMS support #if 0#{?fedora} @@ -876,7 +880,7 @@ This package contains the development files for tdeutils. ########## -%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/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec index 36167329c..fabc84a68 100644 --- a/redhat/core/tdevelop/tdevelop.spec +++ b/redhat/core/tdevelop/tdevelop.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 tdevelop %define tde_prefix /opt/trinity @@ -105,8 +105,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 # DB5 support %if 0%{?rhel} >= 8 || 0%{?fedora} >= 33 @@ -607,7 +611,7 @@ This package contains the libraries needed for the tdevelop programs. ########## -%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/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec index 7989f1758..a55d0cb36 100644 --- a/redhat/core/tdewebdev/tdewebdev.spec +++ b/redhat/core/tdewebdev/tdewebdev.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 tdewebdev %define tde_prefix /opt/trinity @@ -449,7 +449,7 @@ Requires: trinity-kommander-devel = %{?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 @@ -475,10 +475,9 @@ fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DFORCE_DEBUGGER" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_INSTALL_RPATH=OFF \ - -DCMAKE_SKIP_INSTALL_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ |
