diff options
Diffstat (limited to 'redhat/applications')
136 files changed, 847 insertions, 338 deletions
diff --git a/redhat/applications/development/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec index a9d26e026..189c9c617 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kdbg %define tde_prefix /opt/trinity diff --git a/redhat/applications/development/kdiff3/kdiff3.spec b/redhat/applications/development/kdiff3/kdiff3.spec index 67cc2a32c..e22ba95d6 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kdiff3 %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kdiff3.desktop" Development RevisionControl %endif diff --git a/redhat/applications/development/kpicosim/kpicosim.spec b/redhat/applications/development/kpicosim/kpicosim.spec index 24ba5d984..e8dd5f137 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kpicosim %define tde_prefix /opt/trinity @@ -157,7 +157,7 @@ fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -D kpicosim -C "%summary" kpicosim Development IDE %endif diff --git a/redhat/applications/development/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec index c1f8f27e0..f0243059c 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kscope %define tde_prefix /opt/trinity @@ -166,7 +166,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{tde_pkg} Development IDE %endif diff --git a/redhat/applications/development/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec index 93bdc0d11..95b6f9a8a 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg ktechlab %define tde_prefix /opt/trinity @@ -141,7 +141,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r -n ktechlab Science Math %endif diff --git a/redhat/applications/development/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec index 3d66d9006..f8b0dc79e 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kxmleditor %define tde_prefix /opt/trinity @@ -146,7 +146,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "XML Editor" -r "%{tde_pkg}" Utility Editor %endif diff --git a/redhat/applications/development/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec index 7aa506032..e53516bb4 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg piklab %define tde_prefix /opt/trinity @@ -84,7 +84,7 @@ BuildRequires: readline-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else -%if 0%{?fedora} >= 37 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else diff --git a/redhat/applications/development/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec index 7ee1b4307..c0e26b3a7 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdesvn %define tde_prefix /opt/trinity @@ -316,7 +316,7 @@ export PATH="%{_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "SVN Client" %{tde_pkg} Development RevisionControl %endif diff --git a/redhat/applications/development/tdexsldbg/tdexsldbg.spec b/redhat/applications/development/tdexsldbg/tdexsldbg.spec new file mode 100644 index 000000000..d0bd9a3b8 --- /dev/null +++ b/redhat/applications/development/tdexsldbg/tdexsldbg.spec @@ -0,0 +1,180 @@ +# +# spec file for package tdexsldbg (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.5 +%endif +%define tde_pkg tdexsldbg +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: %{tde_version} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Graphical XSLT debugger for TDE +Group: Applications/Multimedia +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + +Obsoletes: trinity-kxsldbg < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release} + +%description +KXSLDbg is a debugger for XSLT scripts. It includes a graphical user +interface as well as a text-based debugger. KXSLDbg can be run as a +standalone application or as an embedded TDE part. + +XSLT is an XML language for defining transformations of XML files from +XML to some other arbitrary format, such as XML, HTML, plain text, etc., +using standard XSLT stylesheets. + +This package is part of TDE, as a component of the TDE web development module. +See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information. + +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DFORCE_DEBUGGER" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang kxsldbg + +%files -f kxsldbg.lang +%defattr(-,root,root,-) +%{tde_bindir}/kxsldbg +%{tde_bindir}/xsldbg +%{tde_tdelibdir}/libkxsldbgpart.la +%{tde_tdelibdir}/libkxsldbgpart.so +%{tde_datadir}/applications/tde/kxsldbg.desktop +%{tde_datadir}/applnk/.hidden/xsldbg.desktop +%{tde_datadir}/apps/kxsldbg/kxsldbg_shell.rc +%{tde_datadir}/apps/kxsldbgpart/kxsldbg_part.rc +%lang(da) %{tde_tdedocdir}/HTML/da/kxsldbg/ +%lang(da) %{tde_tdedocdir}/HTML/da/xsldbg/ +%lang(de) %{tde_tdedocdir}/HTML/de/kxsldbg/ +%lang(en) %{tde_tdedocdir}/HTML/en/kxsldbg/ +%lang(en) %{tde_tdedocdir}/HTML/en/xsldbg/ +%lang(es) %{tde_tdedocdir}/HTML/es/kxsldbg/ +%lang(es) %{tde_tdedocdir}/HTML/es/xsldbg/ +%lang(et) %{tde_tdedocdir}/HTML/et/kxsldbg/ +%lang(et) %{tde_tdedocdir}/HTML/et/xsldbg/ +%lang(fr) %{tde_tdedocdir}/HTML/fr/kxsldbg/ +%lang(it) %{tde_tdedocdir}/HTML/it/kxsldbg/ +%lang(it) %{tde_tdedocdir}/HTML/it/xsldbg/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/kxsldbg/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/xsldbg/ +%lang(pt) %{tde_tdedocdir}/HTML/pt/kxsldbg/ +%lang(pt) %{tde_tdedocdir}/HTML/pt/xsldbg/ +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/kxsldbg/ +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/xsldbg/ +%lang(ru) %{tde_tdedocdir}/HTML/ru/kxsldbg/ +%lang(ru) %{tde_tdedocdir}/HTML/ru/xsldbg/ +%lang(sv) %{tde_tdedocdir}/HTML/sv/kxsldbg/ +%lang(sv) %{tde_tdedocdir}/HTML/sv/xsldbg/ +%{tde_datadir}/icons/hicolor/*/actions/*.png +%{tde_datadir}/icons/hicolor/*/apps/*.png +%{tde_datadir}/icons/locolor/*/apps/*.png +%{tde_mandir}/man1/kxsldbg.1* +%{tde_datadir}/services/kxsldbg_part.desktop + + +%clean +%__rm -rf %{buildroot} + + +%changelog diff --git a/redhat/applications/development/universal-indent-gui-tqt/universal-indent-gui-tqt.spec b/redhat/applications/development/universal-indent-gui-tqt/universal-indent-gui-tqt.spec new file mode 100644 index 000000000..254e8bad5 --- /dev/null +++ b/redhat/applications/development/universal-indent-gui-tqt/universal-indent-gui-tqt.spec @@ -0,0 +1,171 @@ +# +# spec file for package universal-indent-gui-tqt (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.5 +%endif +%define tde_pkg universal-indent-gui-tqt +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.2.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: GUI frontend for several code beautifiers +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: libtool +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +UniversalIndentGui is a GUI fontend for several code beautifiers, currently +supporting: + * Artistic Styler + * BCPP + * Cobol Beautify + * CSSTidy + * Fortran 90 PPR + * GNU Indent + * GreatCode + * hindent + * HTB + * Javascript Decoder + * JSPPP + * Perl Tidy + * PHP_Beautifier + * PHP Code Beautifier + * PHP Stylist + * pindent + * Ruby Beautify + * Ruby Formatter + * Shell Indent + * (HTML) Tidy + * Uncrustify + * XML Indent + +UniversalIndentGui allows you to tune a beautifier's configuration and see +how the changes affects a source example live. It is especially useful to +compare different C/C++ beautifiers when you have to choose one of them. + +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +rm -f src/svnqt/CMakeLists.txt.orig +#rm -fr src/svnqt/cache/sqlite3/ + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" + +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DMAN_INSTALL_DIR=%{tde_mandir} \ + -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + -DBUILD_ALL="ON" \ + .. + +# SMP safe ! +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%files +%defattr(-,root,root,-) +%{tde_bindir}/universal-indent-gui-tqt +%{tde_datadir}/universal-indent-gui-tqt/ + + +%clean +%__rm -rf %{buildroot} + + +%changelog diff --git a/redhat/applications/games/knights/knights.spec b/redhat/applications/games/knights/knights.spec index 44a7c4465..9f849eaf7 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg knights %define tde_prefix /opt/trinity @@ -174,7 +174,7 @@ if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/knights.desktop" Game BoardGame %endif diff --git a/redhat/applications/games/tdeknighttour/tdeknighttour.spec b/redhat/applications/games/tdeknighttour/tdeknighttour.spec index a1d0e4f29..59f01f091 100644 --- a/redhat/applications/games/tdeknighttour/tdeknighttour.spec +++ b/redhat/applications/games/tdeknighttour/tdeknighttour.spec @@ -18,7 +18,7 @@ # Default version for this component %define tde_pkg tdeknighttour %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif # TDE specific building variables diff --git a/redhat/applications/games/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec index 1de244389..800b3770e 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.4 +%define tde_version 14.1.5 %endif # TDE specific building variables diff --git a/redhat/applications/graphics/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec index 3be1a9376..cbafb1194 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg digikam %define tde_prefix /opt/trinity @@ -65,7 +65,7 @@ BuildRequires: trinity-libkexiv2-devel BuildRequires: trinity-libkdcraw-devel BuildRequires: trinity-libkipi-devel -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -91,7 +91,11 @@ BuildRequires: brp-check-trinity # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif @@ -310,7 +314,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %lang(de) %{tde_tdedocdir}/HTML/de/digikam/ %lang(de) %{tde_tdedocdir}/HTML/de/showfoto/ %lang(es) %{tde_tdedocdir}/HTML/es/digikam/ -%lang(es) %{tde_tdedocdir}/HTML/es/showfoto/ %lang(et) %{tde_tdedocdir}/HTML/et/digikam/ %lang(et) %{tde_tdedocdir}/HTML/et/showfoto/ %lang(it) %{tde_tdedocdir}/HTML/it/digikam/ @@ -333,37 +336,38 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +#Â Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ -%if 0%{?rhel} == 5 - --with-included-sqlite3 -%else - --without-included-sqlite3 -%endif + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -371,7 +375,7 @@ export PATH="%{tde_bindir}:${PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -382,7 +386,7 @@ echo "NoDisplay=true" >> "$RPM_BUILD_ROOT%{tde_tdeappdir}/showfoto.desktop" install -D -m 644 "%{SOURCE1}" "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file digikam Graphics Photography %suse_update_desktop_file showfoto Graphics Viewer %suse_update_desktop_file "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop" diff --git a/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec index 1d7d35f88..b2f179912 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg gwenview-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec index ecd571d7e..ed9b7d2ba 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg gwenview %define tde_prefix /opt/trinity @@ -171,7 +171,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file gwenview RasterGraphics Viewer %endif diff --git a/redhat/applications/graphics/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec index f36105b1f..af48edc83 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg ksquirrel %define tde_prefix /opt/trinity @@ -64,7 +64,7 @@ BuildRequires: gettext BuildRequires: trinity-libkipi-devel BuildRequires: trinity-libksquirrel-devel -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -117,55 +117,46 @@ OpenGL and dynamic format support. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export kde_confdir="%{tde_confdir}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build fi -# FIXME: error during ./configure solved by CXXFLAGS below -export CXXFLAGS="${CXXFLAGS} -I%{tde_tdeincludedir}" - -# FIXME: FTBFS during ./configure under rhel8/rhel9 -%if 0%{?rhel} >= 8 -export CXXFLAGS="${CXXFLAGS} -fPIC" -%endif - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ +#Â Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -189,17 +180,11 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop %{tde_datadir}/apps/ksquirrel/ %{tde_datadir}/apps/ksquirrelpart/ -%config(noreplace) %{tde_confdir}/magic/x-ras.magic -%config(noreplace) %{tde_confdir}/magic/x-sun.magic -%config(noreplace) %{tde_confdir}/magic/x-utah.magic %{tde_tdedocdir}/HTML/*/ksquirrel %{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png %{tde_datadir}/mimelnk/image/*.desktop %{tde_datadir}/services/ksquirrelpart.desktop %{tde_mandir}/man1/ksquirrel.1 %{tde_mandir}/man1/ksquirrel-libs-configurator.1* -%config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc -%config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc -%config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc %changelog diff --git a/redhat/applications/graphics/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec index 3dadccc2a..94e8149c4 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg potracegui %define tde_prefix /opt/trinity @@ -156,7 +156,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file potracegui -G "Potrace GUI" Graphics VectorGraphics %endif diff --git a/redhat/applications/internet/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec index c1542d124..c480bbd7d 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kasablanca %define tde_prefix /opt/trinity @@ -95,7 +95,7 @@ BuildRequires: openssl-devel %endif # UTEMPTER support -%if 0%{?suse_version} && 0%{?suse_version} < 1699 +%if 0%{?suse_version} && 0%{?suse_version} < 1600 BuildRequires: utempter-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} @@ -175,7 +175,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Fix desktop files (openSUSE only) -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kasablanca Network FileTransfer %endif diff --git a/redhat/applications/internet/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec index 7da782cde..497e1732d 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kbiff %define tde_prefix /opt/trinity @@ -157,7 +157,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" Applet %endif diff --git a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec index 0099768f7..0c7137a4d 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kftpgrabber %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec index b04bf3f06..aed598825 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg knmap %define tde_prefix /opt/trinity @@ -175,7 +175,7 @@ if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{tde_pkg} TDE System Network %endif diff --git a/redhat/applications/internet/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec index 5fac3bbb0..64a732670 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg konversation %define tde_prefix /opt/trinity @@ -131,7 +131,7 @@ BuildRequires: libXi6-devel # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -232,7 +232,7 @@ fi -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ -DWITH_ALL_OPTIONS=ON \ - -DWITH_GCC_VISIBILITY=ON \ + %{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \ \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ diff --git a/redhat/applications/internet/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec index 88309b15f..1d1a48a68 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kopete-otr %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec index 254ef1112..f27d0f0ad 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kshowmail %define tde_prefix /opt/trinity @@ -158,7 +158,7 @@ install -D -m 644 "pics/cr16-app-kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/i install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/48x48/apps/kshowmail.png" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kshowmail Network Email %endif diff --git a/redhat/applications/internet/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec index 3cab0b6c5..cfa9e272d 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kstreamripper %define tde_prefix /opt/trinity @@ -144,7 +144,7 @@ export PATH="%{tde_bindir}:${PATH}" echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kstreamripper Audio Recorder %endif diff --git a/redhat/applications/internet/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec index 406b2fe93..aea96d4d0 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg ktorrent %define tde_prefix /opt/trinity @@ -95,6 +95,9 @@ Requires: avahi %endif # GEOIP +%if 0%{?rhel} >= 9 || 0%{?suse_version} >= 1600 +%define builtin_geoip 1 +%else %if 0%{?suse_version} %if 0%{?suse_version} < 1550 BuildRequires: libGeoIP-devel @@ -102,6 +105,7 @@ BuildRequires: libGeoIP-devel %else BuildRequires: geoip-devel %endif +%endif %description KTorrent is a BitTorrent program for Trinity. Its features include speed capping @@ -147,7 +151,7 @@ fi \ -DBUILD_ALL=ON \ -DWITH_ALL_OPTIONS=ON \ -%if 0%{?suse_version} == 1699 +%if 0%{?builtin_geoip} -DWITH_BUILTIN_GEOIP=ON \ -DWITH_SYSTEM_GEOIP=OFF \ %endif diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec index 6337d0f1a..20aba0688 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kvirc %define tde_prefix /opt/trinity @@ -203,7 +203,7 @@ export PATH="%{tde_bindir}:${PATH}" %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kvirc Network IRCClient %endif diff --git a/redhat/applications/internet/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec index 4aa66f8af..c306e8fb9 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kvpnc %define tde_prefix /opt/trinity diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec index 3f2aab4cb..2a3fa4c12 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg smb4k %define tde_prefix /opt/trinity @@ -187,7 +187,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %suse_update_desktop_file -r %{tde_pkg} System Network %endif diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec index 7245cda0b..1f9481087 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tork %define tde_prefix /opt/trinity @@ -86,7 +86,7 @@ BuildRequires: brp-check-trinity %endif # TORSOCKS support -BuildRequires: torsocks +#BuildRequires: torsocks # OPENSSL support %if 0%{?mdkver} @@ -96,15 +96,17 @@ BuildRequires: openssl-devel %endif # GEOIP +%if 0%{?rhel} >= 9 || 0%{?suse_version} >= 1600 +%define with_embedded_geoip 1 +%else %if 0%{?suse_version} %if 0%{?suse_version} < 1550 BuildRequires: libGeoIP-devel -%else -%define with_embedded_geoip 1 %endif %else BuildRequires: geoip-devel %endif +%endif %description diff --git a/redhat/applications/misc/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec index 9be203a0c..08a81bfc2 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg bibletime %define tde_prefix /opt/trinity diff --git a/redhat/applications/misc/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec index 8f6daee6c..d719c6ea9 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.4 +%define tde_version 14.1.5 %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 cf5ce74c7..cd43cae0a 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kcmldap %define tde_prefix /opt/trinity @@ -213,7 +213,7 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ -%if 0%{?suse_version} == 1699 +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ %endif diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec index d5996eb48..1841a1d9c 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kcmldapcontroller %define tde_prefix /opt/trinity @@ -166,12 +166,10 @@ This is a TDE control center module to manage users, groups, and machines in Ker %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/primaryrccertupdater -%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?rhel} >= 7 -%if 0%{?pclinuxos} == 0 +%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || ( 0%{?rhel} >= 7 && 0%{?rhel} <= 9 ) %{tde_libdir}/slapi-acl-manager.la %{tde_libdir}/slapi-acl-manager.so %endif -%endif %{tde_tdelibdir}/kcm_ldapcontroller.la %{tde_tdelibdir}/kcm_ldapcontroller.so %{tde_tdeappdir}/ldapcontroller.desktop @@ -192,11 +190,6 @@ This is a TDE control center module to manage users, groups, and machines in Ker %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?pclinuxos} -%__rm -rf acl-updater -%endif - - %build unset QTDIR QTINC QTLIB @@ -209,7 +202,7 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ -%if 0%{?suse_version} == 1699 +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ %endif diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec index b367a7625..75e1f47e3 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kcmldapmanager %define tde_prefix /opt/trinity @@ -190,7 +190,7 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ -%if 0%{?suse_version} == 1699 +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ %endif diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec index 04937d4ef..a794555dd 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kerberostray %define tde_prefix /opt/trinity @@ -169,7 +169,7 @@ if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then fi %cmake \ -%if 0%{?suse_version} == 1699 +%if 0%{?suse_version} >= 1600 || 0%{?pclinuxos} -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-z,now" \ %endif diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec index 749692e05..01defb066 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg krecipes %define tde_prefix /opt/trinity @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -76,7 +76,11 @@ BuildRequires: brp-check-trinity %endif # MYSQL support +%if 0%{?rhel} >= 10 +BuildRequires: mariadb-devel +%else BuildRequires: mysql-devel +%endif # POSTGRESQL support BuildRequires: postgresql @@ -112,36 +116,38 @@ databases. %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} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +#Â Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --with-sqlite \ - --with-mysql \ - --with-postgresql + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -149,17 +155,12 @@ export PATH="%{tde_bindir}:${PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build -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 -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/krecipes.desktop" "%{?buildroot}%{tde_tdeappdir}" - # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r krecipes Education Chemistry %endif diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index 04c1f0995..b8f059362 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg amarok %define tde_prefix /opt/trinity @@ -111,15 +111,23 @@ BuildRequires: libtool BuildRequires: libtool-ltdl-devel %endif -%if 0%{?fedora} >= 37 +# LIBUSB support +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else BuildRequires: libusb-devel %endif -BuildRequires: mysql-devel + BuildRequires: taglib-devel +# MYSQL support +%if 0%{?rhel} >= 10 +BuildRequires: mariadb-devel +%else +BuildRequires: mysql-devel +%endif + # SDL support %if 0%{?mdkver} BuildRequires: %{_lib}SDL-devel @@ -211,7 +219,7 @@ BuildRequires: libmtp-devel %endif # Creative Nomad Jukebox -%if ( 0%{?fedora} >= 19 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 +%if ( 0%{?fedora} >= 19 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?suse_version} >= 1220 && 0%{?suse_version} < 1600 ) %define with_njb 1 %if 0%{?mdkver} BuildRequires: %{_lib}njb-devel @@ -221,7 +229,7 @@ BuildRequires: libnjb-devel %endif # VISUAL support -%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if ( 0%{?rhel} >= 4 && 0%{?rhel} <= 9 ) || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_libvisual 1 %if 0%{?mdkver} BuildRequires: %{_lib}visual-devel @@ -565,6 +573,10 @@ fi # Removes '.so' to avoid automatic -devel dependency %__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so +%if 0%{?with_libvisual} == 0 +%__rm -f $RPM_BUILD_ROOT%{tde_mandir}/man1/amarok_libvisual.1* +%endif + # Locales %find_lang %{tde_pkg} diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec index 5535d81f5..d14c72503 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg codeine %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec index 4e7579dbe..0ddcdcf41 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg k3b-i18n %define tde_prefix /opt/trinity @@ -393,6 +393,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot}%{tde_datadir}/locale/cs %__rm -rf %{buildroot}%{tde_datadir}/locale/cy %__rm -rf %{buildroot}%{tde_datadir}/locale/en_GB +%__rm -rf %{buildroot}%{tde_datadir}/locale/es_AR %__rm -rf %{buildroot}%{tde_datadir}/locale/eu %__rm -rf %{buildroot}%{tde_datadir}/locale/fa %__rm -rf %{buildroot}%{tde_datadir}/locale/fi diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec index 86b10e545..354901af0 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg k3b %define tde_prefix /opt/trinity @@ -84,7 +84,6 @@ BuildRequires: %{_lib}asound-devel BuildRequires: alsa-lib-devel %endif -BuildRequires: audiofile-devel BuildRequires: gettext BuildRequires: taglib-devel BuildRequires: zlib-devel @@ -139,17 +138,21 @@ Requires(postun): coreutils Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29 +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29 || 0%{?rhel} >= 10 Requires: wodim REquires: genisoimage %else Requires: cdrecord REquires: mkisofs %endif + +# dvd+rw-tools support +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) Requires: dvd+rw-tools +%endif # CDRDAO support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 5 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) Requires: cdrdao %endif @@ -273,7 +276,7 @@ BuildRequires: ffmpeg-devel %endif # MUSEPACK -%if 0%{?fedora} == 0 || 0%{?fedora} <= 37 +%if 0%{?fedora} <= 37 && 0%{?rhel} <= 9 # Looking for mpc_decoder_setup in mpcdec - not found %define with_musepack 1 %if 0%{?mdkversion} || 0%{?mgaversion} diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec index 743176af6..b8f3f2448 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg k9copy %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec index 28fe7fc02..f035a39ec 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.4 +%define tde_version 14.1.5 %endif # TDE specific building variables diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec index b14ecd110..0b4a2abed 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kaffeine %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec index 135a4bd69..670b70fa2 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kmplayer %define tde_prefix /opt/trinity @@ -337,7 +337,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video %endif diff --git a/redhat/applications/multimedia/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec index 8325ea14a..e263a6432 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kplayer %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec index 0b6b596a1..e38b4ad93 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg mplayerthumbs %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec index c2f34079e..8eef7280e 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg rosegarden %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec index 394fccd42..aed3ac741 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg soundkonverter %define tde_prefix /opt/trinity diff --git a/redhat/applications/multimedia/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec index 2c1899459..412e1a05a 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tderadio %define tde_prefix /opt/trinity @@ -193,7 +193,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner %endif diff --git a/redhat/applications/office/basket/basket.spec b/redhat/applications/office/basket/basket.spec index a5292b68b..c2033e7aa 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg basket %define tde_prefix /opt/trinity @@ -143,7 +143,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Extended Clipboard" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility %endif diff --git a/redhat/applications/office/kbibtex/kbibtex.spec b/redhat/applications/office/kbibtex/kbibtex.spec index 158214e2c..72069c21f 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kbibtex %define tde_prefix /opt/trinity @@ -164,7 +164,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Bibliography Manager" "%{?buildroot}%{tde_tdeappdir}/kbibtex.desktop" TDE Office Database %endif diff --git a/redhat/applications/office/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec index 668aade19..033dee446 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kbookreader %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbookreader.desktop" Office Viewer %endif diff --git a/redhat/applications/office/keximdb/keximdb.spec b/redhat/applications/office/keximdb/keximdb.spec index 173065957..bc4993c08 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg keximdb %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/kile/kile.spec b/redhat/applications/office/kile/kile.spec index 1a3831de4..0f2f9027e 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kile %define tde_prefix /opt/trinity @@ -190,7 +190,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kile Office WordProcessor %endif diff --git a/redhat/applications/office/kmymoney/kmymoney.spec b/redhat/applications/office/kmymoney/kmymoney.spec index 43039385c..990b88cc3 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kmymoney %define tde_prefix /opt/trinity @@ -37,9 +37,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# Required for Mageia >= 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0.5 @@ -88,11 +85,16 @@ BuildRequires: html2ps BuildRequires: recode # OFX support +%if 0%{?rhel} <= 9 +%define with_libofx 1 +%endif +%if 0%{?with_libofx} %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}ofx-devel %else BuildRequires: libofx-devel %endif +%endif # OPENSP support %if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion} @@ -135,8 +137,10 @@ support. %{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop %{tde_datadir}/servicetypes/kmymoneyplugin.desktop %{tde_libdir}/*.so.* +%if 0%{?with_libofx} %{tde_tdelibdir}/kmm_ofximport.la %{tde_tdelibdir}/kmm_ofximport.so +%endif ########## @@ -155,21 +159,13 @@ have '%{name}' package installed, you will hardly find this package useful. %{tde_datadir}/apps/kmymoney2/ %{tde_datadir}/config.kcfg/kmymoney2.kcfg %{tde_datadir}/icons/hicolor/*/*/*.png -#%dir %{tde_datadir}/icons/Tango/ -#%dir %{tde_datadir}/icons/Tango/*/ -#%dir %{tde_datadir}/icons/Tango/*/*/ -#%{tde_datadir}/icons/Tango/*/*/*.png -#%{tde_datadir}/icons/Tango/scalable/*.svgz %{tde_datadir}/icons/locolor/*/*/*.png -#%dir %{tde_datadir}/icons/oxygen/ -#%dir %{tde_datadir}/icons/oxygen/*/ -#%dir %{tde_datadir}/icons/oxygen/*/*/ -#%{tde_datadir}/icons/oxygen/*/*/*.png -#%{tde_datadir}/icons/oxygen/scalable/*.svgz %{tde_tdedocdir}/HTML/en/kmymoney2/ %{tde_mandir}/man1/kmymoney2.* +%if 0%{?with_libofx} %{tde_datadir}/apps/kmm_ofximport/ %{tde_datadir}/services/kmm_ofximport.desktop +%endif ########## @@ -236,6 +232,7 @@ fi -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ \ -DWITH_ALL_OPTIONS=ON \ + %{!?with_libofx:-DWITH_LIBOFX=OFF} \ \ -DBUILD_ALL=ON \ \ diff --git a/redhat/applications/office/knowit/knowit.spec b/redhat/applications/office/knowit/knowit.spec index 9cf4c959d..c2e34d49b 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg knowit %define tde_prefix /opt/trinity @@ -148,7 +148,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{tde_pkg} Utility Applet X-SuSE-DesktopUtility %endif diff --git a/redhat/applications/office/koffice-i18n/koffice-i18n.spec b/redhat/applications/office/koffice-i18n/koffice-i18n.spec index 1ca8705f1..11adeaa25 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.4 +%define tde_version 14.1.5 %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 47c1dccb6..12208ccb8 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg koffice %define tde_prefix /opt/trinity @@ -102,12 +102,18 @@ BuildRequires: fontconfig-devel BuildRequires: libart_lgpl-devel BuildRequires: zlib-devel BuildRequires: gettext-devel -BuildRequires: mysql-devel BuildRequires: perl BuildRequires: doxygen BuildRequires: aspell-devel BuildRequires: readline-devel +# MYSQL support +%if 0%{?rhel} >= 10 +BuildRequires: mariadb-devel +%else +BuildRequires: mysql-devel +%endif + # PCRE2 support %if 0%{?mdkver} BuildRequires: %{_lib}pcre2-devel @@ -149,11 +155,14 @@ BuildRequires: openssl-devel %endif # OPENEXR support +%define with_openexr 0 +%if 0%{?with_openexr} %if 0%{?mdkver} BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif +%endif # TIFF support %if 0%{?mdkver} @@ -185,7 +194,11 @@ BuildRequires: %{python}-devel # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif @@ -232,7 +245,7 @@ BuildRequires: libpng-devel %endif # GRAPHICSMAGICK support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) %define with_graphicsmagick 1 %if 0%{?suse_version} BuildRequires: GraphicsMagick >= 1.1.0 @@ -251,7 +264,7 @@ BuildRequires: GraphicsMagick-devel >= 1.1.0 %endif # UTEMPTER support -%if 0%{?suse_version} && 0%{?suse_version} < 1699 +%if 0%{?suse_version} && 0%{?suse_version} < 1600 BuildRequires: utempter-devel %endif %if 0%{?rhel} == 4 @@ -1075,15 +1088,17 @@ This package is part of the TDE Office Suite. %{tde_tdelibdir}/libchalkgmagickexport.so %{tde_tdelibdir}/libchalkgmagickimport.la %{tde_tdelibdir}/libchalkgmagickimport.so +%endif %{tde_tdelibdir}/libchalkjpegexport.la %{tde_tdelibdir}/libchalkjpegexport.so %{tde_tdelibdir}/libchalkjpegimport.la %{tde_tdelibdir}/libchalkjpegimport.so -%endif +%if 0%{?with_openexr} %{tde_tdelibdir}/libchalk_openexr_export.la %{tde_tdelibdir}/libchalk_openexr_export.so %{tde_tdelibdir}/libchalk_openexr_import.la %{tde_tdelibdir}/libchalk_openexr_import.so +%endif %{tde_tdelibdir}/libchalkpart.la %{tde_tdelibdir}/libchalkpart.so %{tde_tdelibdir}/libchalkpdfimport.la @@ -1094,12 +1109,10 @@ This package is part of the TDE Office Suite. %{tde_tdelibdir}/libchalkpngimport.so %{tde_tdelibdir}/libchalk_raw_import.la %{tde_tdelibdir}/libchalk_raw_import.so -%if 0%{?with_graphicsmagick} %{tde_tdelibdir}/libchalktiffexport.la %{tde_tdelibdir}/libchalktiffexport.so %{tde_tdelibdir}/libchalktiffimport.la %{tde_tdelibdir}/libchalktiffimport.so -%endif %{tde_libdir}/libtdeinit_chalk.so %{tde_libdir}/libchalk_cmyk_*.so.* %{tde_libdir}/libchalkcolor.so.* @@ -1234,7 +1247,7 @@ fi %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kudesigner Office FlowChart %suse_update_desktop_file kivio Office FlowChart %suse_update_desktop_file kchart Office FlowChart diff --git a/redhat/applications/office/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec index cfaab1cde..882ca67fe 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kpilot %define tde_prefix /opt/trinity @@ -183,7 +183,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{tde_includedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/ # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kpilot.desktop Utility PDA SyncUtility X-KDE-Utilities-Peripherals %suse_update_desktop_file -u -r %{?buildroot}%{tde_tdeappdir}/kpalmdoc.desktop Utility PDA X-TDE-Utilities-File %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 fe2881236..afa01db80 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-ebook-reader %define tde_prefix /opt/trinity diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec index bfe74e656..6f54b47da 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tellico %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/kima/kima.spec b/redhat/applications/settings/kima/kima.spec index 008defd38..2371631d5 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kima %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec index 4b41f0ec8..85ad76ac6 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kiosktool %define tde_prefix /opt/trinity @@ -165,7 +165,7 @@ EOF # Updates applications categories for openSUSE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System SystemSetup %endif diff --git a/redhat/applications/settings/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec index 149714cf9..ad2da69f5 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kkbswitch %define tde_prefix /opt/trinity @@ -176,7 +176,7 @@ if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System TrayIcon %endif diff --git a/redhat/applications/settings/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec index 3d5a65f1b..6766a57c6 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg klcddimmer %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec index c4ce51382..9828d3cb6 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kmyfirewall %define tde_prefix /opt/trinity @@ -225,7 +225,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{tde_pkg}" System Network %endif diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index c01cd0e4e..5b8235ad7 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-guidance %define tde_prefix /opt/trinity @@ -99,7 +99,7 @@ BuildRequires: trinity-pytqt-tools # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 diff --git a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec index 3c2c768a3..dd1a0fa8a 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-systemsettings %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/tdealternatives/tdealternatives.spec b/redhat/applications/settings/tdealternatives/tdealternatives.spec index 8a451b126..7c1b5446f 100644 --- a/redhat/applications/settings/tdealternatives/tdealternatives.spec +++ b/redhat/applications/settings/tdealternatives/tdealternatives.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdealternatives %define tde_prefix /opt/trinity @@ -113,16 +113,14 @@ fi -DCMAKE_SKIP_INSTALL_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWITH_GCC_VISIBILITY=OFF \ + -DWITH_GCC_VISIBILITY=ON \ \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ - -DWITH_ALL_OPTIONS=ON \ - -DWITH_GCC_VISIBILITY=ON \ - \ -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ -DWITH_DISTRIBUTION_RPM=ON \ \ .. diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec index a0ced6807..f4c901415 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdenetworkmanager %define tde_prefix /opt/trinity @@ -263,7 +263,7 @@ fi %__make install DESTDIR=%{?buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet %endif diff --git a/redhat/applications/settings/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec index 23a6eb40a..acd876c35 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdesudo %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec index 18078908e..16cb9ed35 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg wlassistant %define tde_prefix /opt/trinity @@ -183,7 +183,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network %endif diff --git a/redhat/applications/system/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec index 648395e22..e49b41b63 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg dolphin %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/katapult/katapult.spec b/redhat/applications/system/katapult/katapult.spec index 5364e67bd..9c6520b48 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg katapult %define tde_prefix /opt/trinity @@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}" # Fix desktop files (openSUSE only) echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Application Launcher" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility %endif diff --git a/redhat/applications/system/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec index 48d7811fd..9d0804f57 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kbfx %define tde_prefix /opt/trinity @@ -189,7 +189,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build VERBOSE=1 # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "KBFX Configuration Utility" kbfxconfigapp -r KDE Utility DesktopUtility %suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop %suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop diff --git a/redhat/applications/system/kcmautostart/kcmautostart.spec b/redhat/applications/system/kcmautostart/kcmautostart.spec index e1be1cf08..e7aa00d1d 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kcmautostart %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec index 3fdbedaa2..514772030 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kdbusnotification %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec index 441673249..92718e09f 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg klamav %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/knemo/knemo.spec b/redhat/applications/system/knemo/knemo.spec index 93f583e7a..4783492a7 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg knemo %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/knetload/knetload.spec b/redhat/applications/system/knetload/knetload.spec index 96bfd45ed..b10d0d876 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg knetload %define tde_prefix /opt/trinity @@ -160,7 +160,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{tde_pkg} System Monitor %endif diff --git a/redhat/applications/system/knetstats/knetstats.spec b/redhat/applications/system/knetstats/knetstats.spec index 89b7bb713..cb0be10b4 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg knetstats %define tde_prefix /opt/trinity @@ -155,7 +155,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{tde_pkg} System Monitor %endif diff --git a/redhat/applications/system/kooldock/kooldock.spec b/redhat/applications/system/kooldock/kooldock.spec index 24902487a..ed2e8af2a 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kooldock %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec index 847ac5346..afb27d894 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg krusader %define tde_prefix /opt/trinity @@ -147,7 +147,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %suse_update_desktop_file krusader System FileManager %suse_update_desktop_file krusader_root-mode System FileManager diff --git a/redhat/applications/system/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec index 4f1647c81..9444e6b59 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kshutdown %define tde_prefix /opt/trinity @@ -160,7 +160,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kshutdown.desktop" %suse_update_desktop_file %{tde_pkg} Utility DesktopUtility %endif diff --git a/redhat/applications/system/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec index 7696f360a..b409f7c1d 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg ksystemlog %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec index 22f52c17b..30ec471b5 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kvkbd %define tde_prefix /opt/trinity @@ -155,7 +155,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r kvkbd Utility Accessibility %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 693f1f064..eb45042cf 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg polkit-agent-tde %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec index e807face8..896252109 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg smartcardauth %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/tastymenu/tastymenu.spec b/redhat/applications/system/tastymenu/tastymenu.spec index 7090e089d..71537ac3e 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tastymenu %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/tdebluez/tdebluez.spec b/redhat/applications/system/tdebluez/tdebluez.spec index b89642529..8aa137873 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdebluez %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/tdedocker/tdedocker.spec b/redhat/applications/system/tdedocker/tdedocker.spec index d56c73e1b..bf540686b 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdedocker %define tde_prefix /opt/trinity @@ -184,7 +184,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdedocker.desktop Utility DesktopUtility %endif diff --git a/redhat/applications/system/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec index 4af8a839e..3f4585fd9 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdepowersave %define tde_prefix /opt/trinity @@ -97,7 +97,7 @@ BuildRequires: libudev-devel # Disabled on RHEL4 # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?rhel} == 5 BuildRequires: xorg-x11-proto-devel @@ -268,7 +268,6 @@ fi %lang(en) %{tde_tdedocdir}/HTML/en/tdepowersave/ %lang(fi) %{tde_tdedocdir}/HTML/fi/tdepowersave/ %lang(hu) %{tde_tdedocdir}/HTML/hu/tdepowersave/ -%lang(nb) %dir %{tde_tdedocdir}/HTML/nb %lang(nb) %{tde_tdedocdir}/HTML/nb/tdepowersave/ diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec index fe4876756..4f7057001 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdesshaskpass %define tde_prefix /opt/trinity diff --git a/redhat/applications/system/xdg-desktop-portal-tde/xdg-desktop-portal-tde.spec b/redhat/applications/system/xdg-desktop-portal-tde/xdg-desktop-portal-tde.spec new file mode 100644 index 000000000..82ec3f500 --- /dev/null +++ b/redhat/applications/system/xdg-desktop-portal-tde/xdg-desktop-portal-tde.spec @@ -0,0 +1,146 @@ +# +# spec file for package xdg-desktop-portal-tde (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.5 +%endif +%define tde_pkg xdg-desktop-portal-tde +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: An implementation of the FreeDesktop Portals API for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +Exposes TDE APIs to applications which use the Portals API. +As a result, these applications can transparently use native TDE APIs and dialogs. + +########## + +%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{tde_tdelibdir}/libexec/xdg-desktop-portal-tde +%{tde_tdeappdir}/xdg-desktop-portal-tde.desktop +%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.tde.service +%{_datadir}/xdg-desktop-portal/portals/tde.portal +%{_datadir}/xdg-desktop-portal/tde-portals.conf + + +%changelog diff --git a/redhat/applications/system/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec index 6b638cddc..191435537 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg yakuake %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec index 12725cf80..865b88834 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-appinfo %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec index 5f2bdb681..ff455c2e8 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-apt %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec index 9986a073d..52e9e0dff 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-ftps %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec index 382d3914c..0f2f781ea 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-gopher %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec index 48c64c00f..6c82ad625 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-locate %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec index ef9e5258e..ac58ddc34 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-sword %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec index 1b5891279..d286dff41 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeio-umountwrapper %define tde_prefix /opt/trinity 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 43d96bfb9..688150d5e 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg gtk-qt-engine %define tde_prefix /opt/trinity 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 49f9915a8..72214053e 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg gtk3-tqt-engine %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec index b1072adbb..ca8cf9680 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kgtk-qt3 %define tde_prefix /opt/trinity 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 e4c0e3d0e..91412e637 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg ksplash-engine-moodin %define tde_prefix /opt/trinity 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 3250b0ea3..987292123 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg qt4-tqt-theme-engine %define tde_prefix /opt/trinity 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 58bcf6e79..af82b6367 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-baghira %define tde_prefix /opt/trinity 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 825133991..ae62d271c 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-domino %define tde_prefix /opt/trinity 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 7d7f64183..a7399d6bd 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-ia-ora %define tde_prefix /opt/trinity 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 434e5ef6d..a663ee74f 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-lipstik %define tde_prefix /opt/trinity 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 fa5454887..3c8978421 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-polyester %define tde_prefix /opt/trinity 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 f090b2ae4..1855c89d5 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-style-qtcurve %define tde_prefix /opt/trinity diff --git a/redhat/applications/themes/tdmtheme/tdmtheme.spec b/redhat/applications/themes/tdmtheme/tdmtheme.spec index f7f03201a..ea7b092c3 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdmtheme %define tde_prefix /opt/trinity 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 630461d79..5824a0cec 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-crystal %define tde_prefix /opt/trinity 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 dfcfa8ab3..9817a1a3e 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-dekorator %define tde_prefix /opt/trinity 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 904223021..0b3ed6ac9 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-fahrenheit %define tde_prefix /opt/trinity 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 900bb506c..fca87ced8 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-machbunt %define tde_prefix /opt/trinity 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 01526d34e..34bf2a4b2 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-mallory %define tde_prefix /opt/trinity 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 fa18a3075..f91e549fc 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg twin-style-suse2 %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec index 636ba5f6b..e6e6e0fe8 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg abakus %define tde_prefix /opt/trinity @@ -160,7 +160,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/abakus.desktop" Utility Calculator %endif diff --git a/redhat/applications/utilities/filelight/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec index b6c9ec19d..2bb64f4ea 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg filelight %define tde_prefix /opt/trinity @@ -168,7 +168,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/filelight.desktop FileManager %endif diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec index b59b70835..1bf1af63d 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kbarcode %define tde_prefix /opt/trinity @@ -218,7 +218,7 @@ export PATH="%{tde_bindir}:${PATH}" %__sed -i "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" -e "s|Icon=.*|Icon=kbarcode|" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" Utility PrintingUtility %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-batch.desktop" Utility PrintingUtility %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-editor.desktop" Utility PrintingUtility diff --git a/redhat/applications/utilities/kchmviewer/kchmviewer.spec b/redhat/applications/utilities/kchmviewer/kchmviewer.spec index ae46ada21..1d6f39e9b 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kchmviewer %define tde_prefix /opt/trinity @@ -190,7 +190,7 @@ fi # Updates applications categories for openSUSE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Compressed HTML Viewer" kchmviewer Office Viewer %endif diff --git a/redhat/applications/utilities/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec index 15466b6ee..411554323 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kcpuload %define tde_prefix /opt/trinity @@ -153,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}" # Fix desktop files (openSUSE only) echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System Monitor %endif diff --git a/redhat/applications/utilities/kdirstat/kdirstat.spec b/redhat/applications/utilities/kdirstat/kdirstat.spec index d2dfdb333..01f7b35ae 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kdirstat %define tde_prefix /opt/trinity @@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" Filesystem %endif diff --git a/redhat/applications/utilities/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec index 371bea26b..9b2b08137 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg keep %define tde_prefix /opt/trinity @@ -162,7 +162,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/keep.desktop" System Backup %endif diff --git a/redhat/applications/utilities/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec index c226eeeb0..c54ba9a48 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg knutclient %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/kommando/kommando.spec b/redhat/applications/utilities/kommando/kommando.spec index eb68f76fa..8f248a69a 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kommando %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec index 6bafb034c..da5a2644b 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg kompose %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec index d6b5d9442..e381bd4bf 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg krename %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file krename System FileManager %suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop %suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop diff --git a/redhat/applications/utilities/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec index 214bd0add..679f5ca13 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg ksensors %define tde_prefix /opt/trinity @@ -157,7 +157,7 @@ fi %find_lang %{tde_pkg} # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -G "Sensors Frontend" %{tde_pkg} System Monitor %endif diff --git a/redhat/applications/utilities/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec index 2c7cba4d6..07924e461 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg mathemagics %define tde_prefix /opt/trinity diff --git a/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec index f695029a0..542d92b7b 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.4 +%define tde_version 14.1.5 %endif %define tde_pkg qalculate-tde %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang qalculate_tde # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file qalculate_tde -r TDE Utility Calculator %endif |