summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/abakus/abakus.spec3
-rw-r--r--redhat/applications/amarok/amarok.spec15
-rw-r--r--redhat/applications/filelight/filelight.spec2
l---------redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh1
-rw-r--r--redhat/applications/gtk-qt-engine/gtk-qt-engine.spec22
l---------redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde41
l---------redhat/applications/gtk-qt-engine/gtkrc-2.0-kde41
-rw-r--r--redhat/applications/k3b/k3b.spec4
-rw-r--r--redhat/applications/k9copy/k9copy.spec2
-rw-r--r--redhat/applications/kbfx/kbfx.spec2
-rw-r--r--redhat/applications/kgtk-qt3/kgtk-qt3.spec2
-rw-r--r--redhat/applications/kile/kile.spec54
-rw-r--r--redhat/applications/klamav/klamav.spec2
-rw-r--r--redhat/applications/koffice-i18n/koffice-i18n.spec77
-rw-r--r--redhat/applications/koffice/koffice.spec19
-rw-r--r--redhat/applications/kompose/kompose.spec2
-rw-r--r--redhat/applications/konversation/konversation.spec21
-rw-r--r--redhat/applications/krecipes/krecipes.spec3
-rw-r--r--redhat/applications/ktorrent/ktorrent.spec1
-rw-r--r--redhat/applications/kxmleditor/kxmleditor.spec2
-rw-r--r--redhat/applications/piklab/piklab.spec7
-rw-r--r--redhat/applications/polkit-agent-tde/polkit-agent-tde.spec2
-rw-r--r--redhat/applications/rosegarden/rosegarden.spec6
-rw-r--r--redhat/applications/system/tdesshaskpass/tdesshaskpass.spec2
-rw-r--r--redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec2
-rw-r--r--redhat/applications/tdeio-appinfo/tdeio-appinfo.spec160
-rw-r--r--redhat/applications/tdeio-locate/tdeio-locate.spec9
-rw-r--r--redhat/applications/tdenetworkmanager/tdenetworkmanager.spec2
-rw-r--r--redhat/applications/tdepowersave/tdepowersave.spec4
-rw-r--r--redhat/applications/tderadio/tderadio.spec69
-rw-r--r--redhat/applications/tdesvn/tdesvn.spec2
-rw-r--r--redhat/applications/tellico/tellico.spec13
-rw-r--r--redhat/applications/twin-style-dekorator/twin-style-dekorator.spec2
-rw-r--r--redhat/applications/twin-style-machbunt/twin-style-machbunt.spec153
-rw-r--r--redhat/applications/twin-style-suse2/twin-style-suse2.spec2
-rw-r--r--redhat/applications/wlassistant/wlassistant.spec6
36 files changed, 523 insertions, 154 deletions
diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec
index ecc87ddbb..e2f921280 100644
--- a/redhat/applications/abakus/abakus.spec
+++ b/redhat/applications/abakus/abakus.spec
@@ -75,7 +75,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -168,6 +168,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/hicolor/*/apps/abakus.png
%{tde_tdedocdir}/HTML/en/abakus/
%{tde_tdeappdir}/abakus.desktop
+%{tde_mandir}/man1/abakus.1*
%changelog
diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec
index eee0076ca..5ee4de02c 100644
--- a/redhat/applications/amarok/amarok.spec
+++ b/redhat/applications/amarok/amarok.spec
@@ -99,7 +99,12 @@ BuildRequires: libtool
BuildRequires: libtool-ltdl-devel
%endif
+%if 0%{?fedora} >= 37
+BuildRequires: libusb1-devel
+BuildRequires: libusb-compat-0.1-devel
+%else
BuildRequires: libusb-devel
+%endif
BuildRequires: mysql-devel
BuildRequires: SDL-devel
BuildRequires: taglib-devel
@@ -126,7 +131,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -167,7 +172,7 @@ BuildRequires: karma-sharp
%endif
# GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_gpod 1
BuildRequires: libgpod-devel >= 0.4.2
%endif
@@ -264,11 +269,11 @@ BuildRequires: rubypick
%endif
# PYTHON support
-%if 0%{?sle_version} >= 150400
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 8
%define python python3
%define __python %__python3
%else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
@@ -466,7 +471,7 @@ fi
"amarok/src/scripts/webcontrol/Playlist.py" \
"amarok/src/scripts/webcontrol/RequestHandler.py" \
"amarok/src/scripts/webcontrol/WebControl.py" \
- -e "s|/usr/bin/env python|/usr/bin/env python2|"
+ -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
%endif
diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/filelight/filelight.spec
index f3a4a5897..cd454fbdf 100644
--- a/redhat/applications/filelight/filelight.spec
+++ b/redhat/applications/filelight/filelight.spec
@@ -70,7 +70,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
deleted file mode 120000
index 373c65ab3..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh \ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec
index 843cd5440..7d9db849a 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec
@@ -56,9 +56,6 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1: gtk-qt-engine.rc.sh
-Source2: gtkrc-2.0-kde4
-Source3: gtkrc-2.0-kde-kde4
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -154,29 +151,20 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-%find_lang gtkqtengine
-
-# Adds TDE's specific GTKRC
-%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh"
-%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4"
-%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4"
+%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
-%files -f gtkqtengine.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING TODO
%{tde_tdelibdir}/kcm_kcmgtk.la
%{tde_tdelibdir}/kcm_kcmgtk.so
-%{tde_appdir}/kcmgtk.desktop
-%dir %{tde_datadir}/apps/kgtk
-%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh
-%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4
-%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4
-%{tde_tdedocdir}/HTML/en/kcmgtk/
+%{tde_tdeappdir}/kcmgtk.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/gtk/
# The following files are outside TDE's directory
%dir %{_libdir}/gtk-2.0
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
deleted file mode 120000
index 62aa57f04..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 \ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
deleted file mode 120000
index 2d0ca2867..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4 \ No newline at end of file
diff --git a/redhat/applications/k3b/k3b.spec b/redhat/applications/k3b/k3b.spec
index 2edb92088..a1688b402 100644
--- a/redhat/applications/k3b/k3b.spec
+++ b/redhat/applications/k3b/k3b.spec
@@ -90,7 +90,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -271,7 +271,7 @@ start.
%{tde_tdelibdir}/libk3bwavedecoder.la
%{tde_tdelibdir}/libk3bwavedecoder.so
%lang(en) %{tde_tdedocdir}/HTML/en/k3b/
-
+%{tde_mandir}/man1/k3b.1*
##########
diff --git a/redhat/applications/k9copy/k9copy.spec b/redhat/applications/k9copy/k9copy.spec
index 656727906..0a9801a8d 100644
--- a/redhat/applications/k9copy/k9copy.spec
+++ b/redhat/applications/k9copy/k9copy.spec
@@ -150,6 +150,7 @@ fi
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
+ --mandir=%{tde_mandir} \
\
--disable-dependency-tracking \
--disable-debug \
@@ -185,6 +186,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
%{tde_datadir}/icons/hicolor/*/apps/k9copy.png
+%{tde_mandir}/man1/k9copy.1*
%changelog
diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/kbfx/kbfx.spec
index 3e5c06b1b..44df9443c 100644
--- a/redhat/applications/kbfx/kbfx.spec
+++ b/redhat/applications/kbfx/kbfx.spec
@@ -82,7 +82,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
index cff4f8b69..ecc87aad6 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
@@ -89,7 +89,7 @@ BuildRequires: gtk+2.0-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
diff --git a/redhat/applications/kile/kile.spec b/redhat/applications/kile/kile.spec
index 31b8d0947..b424e7ae5 100644
--- a/redhat/applications/kile/kile.spec
+++ b/redhat/applications/kile/kile.spec
@@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -149,45 +149,42 @@ Kile can support large projects consisting of several smaller files.
%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/"*"/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} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes the KCM not to work at all !
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ ..
%__make %{?_smp_mflags}
+
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh
-
-# Unwanted files ...
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml
+%__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg}
@@ -221,6 +218,7 @@ export PATH="%{tde_bindir}:${PATH}"
%lang(pt) %{tde_tdedocdir}/HTML/pt/kile/
%lang(sv) %{tde_tdedocdir}/HTML/sv/kile/
+%{tde_mandir}/man1/kile.1*
%changelog
diff --git a/redhat/applications/klamav/klamav.spec b/redhat/applications/klamav/klamav.spec
index 41882f16e..af6b1725d 100644
--- a/redhat/applications/klamav/klamav.spec
+++ b/redhat/applications/klamav/klamav.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg klamav
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/koffice-i18n/koffice-i18n.spec b/redhat/applications/koffice-i18n/koffice-i18n.spec
index f71f0fe38..8e1c91577 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n.spec
+++ b/redhat/applications/koffice-i18n/koffice-i18n.spec
@@ -74,7 +74,7 @@ BuildRequires: desktop-file-utils
BuildRequires: findutils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -573,45 +573,66 @@ Provides: %{name}-tz_TW = %{?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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-
%build
+unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+(
+for l in . %{TDE_LANGS}; do
+ if [ $l != '.' ]; then
+ pushd "%{tde_pkg}-${l}"
+ else
+ pushd ${l}
+ fi
+
+ if ! rpm -E %%cmake|grep -q "cd 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} \
+ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ \
+ -DBUILD_ALL=ON \
+ \
+ ..
+
+ %__make %{?_smp_mflags}
+
+ popd
+done
+) 2>&1 | tee /tmp/rpmbuild.$$
-export kde_htmldir="%{tde_tdedocdir}/HTML"
+if grep -qw TDE_Error /tmp/rpmbuild.$$; then
+ echo "Error while building. See '/tmp/rpmbuild.$$'"
+ exit 1
+fi
-for l in %{TDE_LANGS}; do
- for f in koffice-i18n-${l}/; do
- if [ -d "${f}" ]; then
- pushd ${f}
- %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|"
- %__make -f "admin/Makefile.common"
- %configure \
- --prefix=%{tde_prefix} \
- --datadir=%{tde_datadir} \
- --docdir=%{tde_tdedocdir}
- %__make %{?_smp_mflags}
- popd
- fi
- done
-done
+wait
+rm -f /tmp/rpmbuild.$$
%install
-%__rm -rf %{?buildroot}
export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
for l in %{TDE_LANGS}; do
- for f in koffice-i18n-${l}/; do
- if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then
- %__make install DESTDIR="%{?buildroot}" -C "${f}"
- fi
- done
+ %__make DESTDIR=%{buildroot} -C build install-${l}
done
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%clean
%__rm -rf %{buildroot}
diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec
index 43b5365eb..42851dd74 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/koffice/koffice.spec
@@ -113,11 +113,12 @@ BuildRequires: libexif-devel
BuildRequires: readline-devel
# PYTHON support
-%if 0%{?sle_version} >= 150400
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
%define with_python 0
+%global __python %__python3
%else
%define with_python 1
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
@@ -394,6 +395,10 @@ Requires: perl
%{tde_tdelibdir}/krossruby.*
%endif
%endif
+%{tde_mandir}/man1/koconverter.1*
+%{tde_mandir}/man1/koscript.1*
+%{tde_mandir}/man1/koshell.1*
+%{tde_mandir}/man1/kthesaurus.1*
##########
@@ -430,6 +435,7 @@ License: LGPLv2+
%{tde_libdir}/libkrossapi.so.*
%{tde_libdir}/libkrossmain.so.*
%endif
+%{tde_mandir}/man1/kspread.1*
##########
@@ -475,6 +481,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/templates/TextDocument.desktop
%{tde_datadir}/templates/.source/TextDocument.kwt
%{tde_tdeappdir}/*kword.desktop
+%{tde_mandir}/man1/kword.1*
##########
@@ -537,6 +544,8 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/templates/Presentation.desktop
%{tde_datadir}/templates/.source/Presentation.kpt
%{tde_tdeappdir}/*kpresenter.desktop
+%{tde_mandir}/man1/kprconverter.pl.1*
+%{tde_mandir}/man1/kpresenter.1*
##########
@@ -561,6 +570,7 @@ Obsoletes: kivio < %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/config.kcfg/kivio.kcfg
%{tde_datadir}/services/kivio*.desktop
%{tde_tdeappdir}/*kivio.desktop
+%{tde_mandir}/man1/kivio.1*
##########
@@ -587,6 +597,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/templates/Illustration.desktop
%{tde_datadir}/templates/.source/Illustration.karbon
%{tde_tdeappdir}/*karbon.desktop
+%{tde_mandir}/man1/karbon.1*
##########
@@ -616,6 +627,8 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/services/kugar*.desktop
%{tde_tdeappdir}/*kugar.desktop
%{tde_tdeappdir}/*kudesigner.desktop
+%{tde_mandir}/man1/kudesigner.1*
+%{tde_mandir}/man1/kugar.1*
##########
@@ -721,6 +734,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
%{tde_datadir}/apps/kchart/
%{tde_datadir}/services/kchart*.desktop
%{tde_tdeappdir}/*kchart.desktop
+%{tde_mandir}/man1/kchart.1*
##########
@@ -761,6 +775,7 @@ Requires: dejavu
%{tde_datadir}/apps/kformula/
%{tde_datadir}/services/kformula*.desktop
%{tde_tdeappdir}/*kformula.desktop
+%{tde_mandir}/man1/kformula.1*
##########
diff --git a/redhat/applications/kompose/kompose.spec b/redhat/applications/kompose/kompose.spec
index bdda7fcd9..6650188b2 100644
--- a/redhat/applications/kompose/kompose.spec
+++ b/redhat/applications/kompose/kompose.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.1.0
%endif
%define tde_pkg kompose
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec
index 80e0b7e39..3b3a11a75 100644
--- a/redhat/applications/konversation/konversation.spec
+++ b/redhat/applications/konversation/konversation.spec
@@ -74,6 +74,23 @@ BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
+# PYTHON support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define with_python 0
+%global __python %__python3
+%else
+%define with_python 1
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires: %{python}
+BuildRequires: %{python}-devel
+%endif
# SUSE desktop files utility
%if 0%{?suse_version}
@@ -110,7 +127,7 @@ BuildRequires: libXi6-devel
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
# RHEL 8: 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} <= 8 ) || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5
@@ -182,7 +199,7 @@ and experienced users alike will appreciate its many features:
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
%__sed -i "konversation/scripts/media" \
"konversation/scripts/weather" \
- -e "s|/usr/bin/env python|/usr/bin/env python2|"
+ -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
%endif
diff --git a/redhat/applications/krecipes/krecipes.spec b/redhat/applications/krecipes/krecipes.spec
index c2b24ef16..5609d2f65 100644
--- a/redhat/applications/krecipes/krecipes.spec
+++ b/redhat/applications/krecipes/krecipes.spec
@@ -130,6 +130,7 @@ export PATH="%{tde_bindir}:${PATH}"
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
+ --mandir=%{tde_mandir} \
\
--disable-dependency-tracking \
--disable-debug \
@@ -185,6 +186,6 @@ export PATH="%{tde_bindir}:${PATH}"
%lang(et) %{tde_tdedocdir}/HTML/et/
%lang(pt) %{tde_tdedocdir}/HTML/pt/
%lang(sv) %{tde_tdedocdir}/HTML/sv/
-
+%{tde_mandir}/man1/krecipes.1*
%changelog
diff --git a/redhat/applications/ktorrent/ktorrent.spec b/redhat/applications/ktorrent/ktorrent.spec
index ce6aaea3e..4cb54d155 100644
--- a/redhat/applications/ktorrent/ktorrent.spec
+++ b/redhat/applications/ktorrent/ktorrent.spec
@@ -214,6 +214,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdelibdir}/ktzeroconfplugin.la
%{tde_tdelibdir}/ktzeroconfplugin.so
%endif
+%{tde_mandir}/man1/ktorrent.1*
%changelog
diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec
index 13fc08a17..6073e3747 100644
--- a/redhat/applications/kxmleditor/kxmleditor.spec
+++ b/redhat/applications/kxmleditor/kxmleditor.spec
@@ -76,8 +76,6 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
-Requires: mplayer
-
%description
KXML Editor is a simple program, that displays and edits the contents of an
diff --git a/redhat/applications/piklab/piklab.spec b/redhat/applications/piklab/piklab.spec
index ff8d574d2..ddc1c3123 100644
--- a/redhat/applications/piklab/piklab.spec
+++ b/redhat/applications/piklab/piklab.spec
@@ -84,7 +84,12 @@ BuildRequires: readline-devel
BuildRequires: %{_lib}usb1.0-devel
BuildRequires: %{_lib}usb-compat0.1-devel
%else
-BuildRequires: libusb-devel
+%if 0%{?fedora} >= 37
+BuildRequires: libusb1-devel
+BuildRequires: libusb-compat-0.1-devel
+%else
+BuildRequires: libusb-devel
+%endif
%endif
diff --git a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec
index 4bf776156..c71ddce8e 100644
--- a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec
+++ b/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec
@@ -17,7 +17,7 @@
# TDE variables
%if "%{?tde_version}" == ""
-%define tde_version 14.0.11
+%define tde_version 14.1.0
%endif
%define tde_pkg polkit-agent-tde
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/rosegarden/rosegarden.spec b/redhat/applications/rosegarden/rosegarden.spec
index 94c5bfee1..c4debe030 100644
--- a/redhat/applications/rosegarden/rosegarden.spec
+++ b/redhat/applications/rosegarden/rosegarden.spec
@@ -115,7 +115,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -233,6 +233,10 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_bindir}/rosegarden-lilypondview
%{tde_bindir}/rosegarden-project-package
%{tde_bindir}/rosegardensequencer
+%{tde_mandir}/man1/rosegarden-audiofile-importer.1*
+%{tde_mandir}/man1/rosegarden-lilypondview.1*
+%{tde_mandir}/man1/rosegarden-project-package.1*
+%{tde_mandir}/man1/rosegarden.1*
%files data -f %{tde_pkg}.lang
%defattr(-,root,root,-)
diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
index 191e9949e..bab439d53 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.0.10
+%define tde_version 14.1.0
%endif
%define tde_pkg tdesshaskpass
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec
index 368233282..08edda0f9 100644
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec
+++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec
@@ -85,7 +85,7 @@ BuildRequires: libacl-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
diff --git a/redhat/applications/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio-appinfo/tdeio-appinfo.spec
new file mode 100644
index 000000000..66c56bf9c
--- /dev/null
+++ b/redhat/applications/tdeio-appinfo/tdeio-appinfo.spec
@@ -0,0 +1,160 @@
+#
+# spec file for package tdeio-appinfo (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.0
+%endif
+%define tde_pkg tdeio-appinfo
+%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.3
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: TDEIO slave for the appinfo protocol
+Group: Productivity/Networking/Ftp/Clients
+URL: http://lukeplant.me.uk/kio-appinfo/
+
+%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: gettext
+
+BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
+# 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
+Adds support for the "appinfo:" protocol
+to Konqueror and other TDE applications.
+.
+This enables you to perform appinfo: searches in TDE.
+
+##########
+
+%if 0%{?pclinuxos} || 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 -q "cd 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 \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
+ ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md
+%{tde_tdelibdir}/tdeio_appinfo.la
+%{tde_tdelibdir}/tdeio_appinfo.so
+%{tde_datadir}/services/appinfo.protocol
+
+
+%changelog
diff --git a/redhat/applications/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio-locate/tdeio-locate.spec
index cdbfafeef..b00e4a7ef 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate.spec
+++ b/redhat/applications/tdeio-locate/tdeio-locate.spec
@@ -84,7 +84,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -155,19 +155,20 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
-%find_lang %{tde_pkg}
+%find_lang tdeio_locate
+
%clean
%__rm -rf %{buildroot}
-%files -f %{tde_pkg}.lang
+%files -f tdeio_locate.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING TODO
%{tde_tdelibdir}/tdeio_locate.la
%{tde_tdelibdir}/tdeio_locate.so
-%{tde_tdedocdir}/HTML/en/tdeio-locate/
+%{tde_tdedocdir}/HTML/en/tdeioslave/locate/
%{tde_datadir}/services/locate.protocol
%{tde_datadir}/services/locater.protocol
%{tde_datadir}/services/rlocate.protocol
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
index b8e37c2c5..e1b15a209 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
@@ -136,7 +136,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/tdepowersave/tdepowersave.spec
index 461b1c98e..bec9a33c3 100644
--- a/redhat/applications/tdepowersave/tdepowersave.spec
+++ b/redhat/applications/tdepowersave/tdepowersave.spec
@@ -117,7 +117,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -232,7 +232,7 @@ fi
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING TODO
%{tde_bindir}/tdepowersave
%{tde_libdir}/libtdeinit_tdepowersave.la
%{tde_libdir}/libtdeinit_tdepowersave.so
diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/tderadio/tderadio.spec
index 47ef2c7ca..d7d3b7315 100644
--- a/redhat/applications/tderadio/tderadio.spec
+++ b/redhat/applications/tderadio/tderadio.spec
@@ -65,7 +65,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
@@ -147,45 +147,36 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-visibility causes applications fails to start !
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-final \
- --enable-new-ldflags \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
- %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \
- --enable-v4l2 \
- --enable-lame \
- --enable-ogg \
- --enable-alsa \
- --enable-oss
-
-%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
-%__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||"
-%endif
+ -DBUILD_ALL=ON \
+ ..
%__make %{?_smp_mflags}
@@ -193,7 +184,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}
@@ -202,6 +193,10 @@ export PATH="%{tde_bindir}:${PATH}"
%suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
%endif
+# Remove devel files
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.la
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.so
+
%clean
%__rm -rf %{buildroot}
@@ -211,6 +206,8 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-)
%{tde_bindir}/convert-presets
%{tde_bindir}/tderadio
+%{tde_libdir}/libtderadio.so.0
+%{tde_libdir}/libtderadio.so.0.0.0
%dir %{tde_libdir}/tderadio
%dir %{tde_libdir}/tderadio/plugins
%{tde_libdir}/tderadio/plugins/*.la
@@ -221,10 +218,14 @@ export PATH="%{tde_bindir}:${PATH}"
%dir %{tde_datadir}/icons/hicolor/256x256/actions
%{tde_datadir}/icons/hicolor/*/*/tderadio*.png
%{tde_datadir}/icons/locolor/*/*/tderadio*.png
+%{tde_datadir}/pixmaps/tderadio.xpm
%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
%{tde_tdedocdir}/HTML/en/tderadio/
+%{tde_mandir}/man1/convert-presets.1*
+%{tde_mandir}/man1/tderadio.1*
+
%changelog
diff --git a/redhat/applications/tdesvn/tdesvn.spec b/redhat/applications/tdesvn/tdesvn.spec
index 7ee60eec3..6b41cc888 100644
--- a/redhat/applications/tdesvn/tdesvn.spec
+++ b/redhat/applications/tdesvn/tdesvn.spec
@@ -91,7 +91,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/tellico/tellico.spec
index 76e327043..7002a965b 100644
--- a/redhat/applications/tellico/tellico.spec
+++ b/redhat/applications/tellico/tellico.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 23
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 9
%define _hardened_ldflags %nil
%endif
@@ -13,7 +13,7 @@
# 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)
+# license that confolrms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
@@ -139,7 +139,7 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
@@ -154,11 +154,11 @@ BuildRequires: libacl-devel
BuildRequires: libattr-devel
# PYTHON support
-%if 0%{?sle_version} >= 150400
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
%define python python3
%define __python %__python3
%else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
@@ -197,6 +197,7 @@ It also makes it easy for other softwares to use the Tellico data.
%{tde_bindir}/tellico
%{tde_datadir}/applications
%config(noreplace) %{tde_confdir}/tellicorc
+%{tde_mandir}/man1/tellico.1*
##########
@@ -297,7 +298,7 @@ fi
"src/fetch/scripts/ministerio_de_cultura.py" \
"src/fetch/scripts/fr.allocine.py" \
"src/translators/griffith2tellico.py" \
- -e "s|/usr/bin/env python|/usr/bin/env python2|"
+ -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
%endif
diff --git a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec
index 47950e707..058735c56 100644
--- a/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec
+++ b/redhat/applications/twin-style-dekorator/twin-style-dekorator.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.1.0
%endif
%define tde_pkg twin-style-dekorator
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/twin-style-machbunt/twin-style-machbunt.spec
new file mode 100644
index 000000000..62b8efb2c
--- /dev/null
+++ b/redhat/applications/twin-style-machbunt/twin-style-machbunt.spec
@@ -0,0 +1,153 @@
+#
+# spec file for package twin-style-machbunt (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.0
+%endif
+%define tde_pkg twin-style-machbunt
+%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: TDE window decoration from SUSE 9.1/9.2
+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: gettext
+
+BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+
+%description
+This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2.
+
+An example color scheme is provided too.
+
+
+##########
+
+%if 0%{?pclinuxos} || 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 -q "cd 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 \
+ \
+ -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} \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ \
+ -DWITH_ALL_OPTIONS=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,-)
+%doc AUTHORS COPYING
+%{tde_tdelibdir}/twin3_MachBunt.la
+%{tde_tdelibdir}/twin3_MachBunt.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc
+%{tde_datadir}/apps/twin/MachBunt.desktop
+
+
+%changelog
diff --git a/redhat/applications/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/twin-style-suse2/twin-style-suse2.spec
index c53e0e878..b1cdae23c 100644
--- a/redhat/applications/twin-style-suse2/twin-style-suse2.spec
+++ b/redhat/applications/twin-style-suse2/twin-style-suse2.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.1.0
%endif
%define tde_pkg twin-style-suse2
%define tde_prefix /opt/trinity
diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/wlassistant/wlassistant.spec
index 823f48b66..85fefd29f 100644
--- a/redhat/applications/wlassistant/wlassistant.spec
+++ b/redhat/applications/wlassistant/wlassistant.spec
@@ -96,17 +96,17 @@ BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# PYTHON support
-%if 0%{?sle_version} >= 150400
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
%define python python3
%define __python %__python3
%else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}