summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--redhat/applications/filelight/filelight.spec2
-rw-r--r--redhat/applications/katapult/katapult.spec2
-rw-r--r--redhat/applications/kbarcode/kbarcode.spec9
-rw-r--r--redhat/applications/kbibtex/kbibtex.spec2
-rw-r--r--redhat/applications/kbiff/kbiff.spec2
-rw-r--r--redhat/applications/kcpuload/kcpuload.spec2
-rw-r--r--redhat/applications/kdirstat/kdirstat.spec2
-rw-r--r--redhat/applications/kiosktool/kiosktool.spec2
-rw-r--r--redhat/applications/kkbswitch/kkbswitch.spec2
-rw-r--r--redhat/applications/kstreamripper/kstreamripper.spec2
-rw-r--r--redhat/applications/tde-guidance/tde-guidance.spec2
-rw-r--r--redhat/dependencies/arts/arts.spec2
-rw-r--r--redhat/main/tde-i18n/tde-i18n.spec2
-rw-r--r--redhat/main/tdeedu/tdeedu.spec6
14 files changed, 21 insertions, 18 deletions
diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/filelight/filelight.spec
index 1d227689c..4d77fa722 100644
--- a/redhat/applications/filelight/filelight.spec
+++ b/redhat/applications/filelight/filelight.spec
@@ -155,7 +155,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-%suse_update_desktop_file filelight FileManager
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/filelight.desktop FileManager
%endif
diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/katapult/katapult.spec
index 985f668fb..90148f56a 100644
--- a/redhat/applications/katapult/katapult.spec
+++ b/redhat/applications/katapult/katapult.spec
@@ -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}
-%suse_update_desktop_file -G "Application Launcher" katapult DesktopUtility
+%suse_update_desktop_file -G "Application Launcher" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility
%endif
diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/kbarcode/kbarcode.spec
index f551feb38..52ce1ed23 100644
--- a/redhat/applications/kbarcode/kbarcode.spec
+++ b/redhat/applications/kbarcode/kbarcode.spec
@@ -136,7 +136,6 @@ to use them in another application.
%package tdefile-plugin
Summary: tdefile-plugin for %{name}
Group: Applications/Utilities
-#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description tdefile-plugin
%{summary}.
@@ -207,10 +206,10 @@ export PATH="%{tde_bindir}:${PATH}"
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-%suse_update_desktop_file -r kbarcode Utility PrintingUtility
-%suse_update_desktop_file -r kbarcode-batch Utility PrintingUtility
-%suse_update_desktop_file -r kbarcode-editor Utility PrintingUtility
-%suse_update_desktop_file -r kbarcode-single Utility PrintingUtility
+%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
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-single.desktop" Utility PrintingUtility
%endif
diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/kbibtex/kbibtex.spec
index 903e91f69..0a8632c31 100644
--- a/redhat/applications/kbibtex/kbibtex.spec
+++ b/redhat/applications/kbibtex/kbibtex.spec
@@ -152,7 +152,7 @@ fi
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-%suse_update_desktop_file -G "Bibliography Manager" kbibtex TDE Office Database
+%suse_update_desktop_file -G "Bibliography Manager" "%{?buildroot}%{tde_tdeappdir}/kbibtex.desktop" TDE Office Database
%endif
diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/kbiff/kbiff.spec
index 41af42e65..038fa2da9 100644
--- a/redhat/applications/kbiff/kbiff.spec
+++ b/redhat/applications/kbiff/kbiff.spec
@@ -150,7 +150,7 @@ fi
# Updates applications categories for openSUSE
%if 0%{?suse_version}
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop"
-%suse_update_desktop_file kbiff Applet
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" Applet
%endif
diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/kcpuload/kcpuload.spec
index 2a15211f7..5e23e966c 100644
--- a/redhat/applications/kcpuload/kcpuload.spec
+++ b/redhat/applications/kcpuload/kcpuload.spec
@@ -149,7 +149,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Fix desktop files (openSUSE only)
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%if 0%{?suse_version}
-%suse_update_desktop_file kcpuload System Monitor
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System Monitor
%endif
diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/kdirstat/kdirstat.spec
index d85822456..830ed300a 100644
--- a/redhat/applications/kdirstat/kdirstat.spec
+++ b/redhat/applications/kdirstat/kdirstat.spec
@@ -153,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-%suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" kdirstat Filesystem
+%suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" Filesystem
%endif
diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/kiosktool/kiosktool.spec
index 72f57a4c6..4096a20d3 100644
--- a/redhat/applications/kiosktool/kiosktool.spec
+++ b/redhat/applications/kiosktool/kiosktool.spec
@@ -157,7 +157,7 @@ EOF
# Updates applications categories for openSUSE
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%if 0%{?suse_version}
-%suse_update_desktop_file %{tde_pkg} System SystemSetup
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System SystemSetup
%endif
diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/kkbswitch/kkbswitch.spec
index 489fc406b..c6d7513ec 100644
--- a/redhat/applications/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/kkbswitch/kkbswitch.spec
@@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Updates applications categories for openSUSE
%if 0%{?suse_version}
-%suse_update_desktop_file -r %{tde_pkg} System TrayIcon
+%suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System TrayIcon
%endif
diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/kstreamripper/kstreamripper.spec
index e4a98a26e..a115bf5fc 100644
--- a/redhat/applications/kstreamripper/kstreamripper.spec
+++ b/redhat/applications/kstreamripper/kstreamripper.spec
@@ -83,7 +83,7 @@ BuildRequires: brp-check-trinity
#BuildRequires: scons
# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1550
%define python python2
%define __python %__python2
%else
diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/tde-guidance/tde-guidance.spec
index 0649514e9..a45941c5c 100644
--- a/redhat/applications/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/tde-guidance/tde-guidance.spec
@@ -141,7 +141,7 @@ BuildRequires: xscreensaver-gl
%endif
# PYTHON
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
%define python python2
%define __python %__python2
%else
diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec
index 5c0028fae..822e5ad84 100644
--- a/redhat/dependencies/arts/arts.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -83,7 +83,7 @@ BuildRequires: esound-devel
%endif
# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+%if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
%define with_jack 1
%if 0%{?rhel} >= 5 || 0%{?fedora}
%define jack_devel jack-audio-connection-kit-devel
diff --git a/redhat/main/tde-i18n/tde-i18n.spec b/redhat/main/tde-i18n/tde-i18n.spec
index 6cf838bc5..e5320ab64 100644
--- a/redhat/main/tde-i18n/tde-i18n.spec
+++ b/redhat/main/tde-i18n/tde-i18n.spec
@@ -1451,7 +1451,7 @@ for l in %{TDE_LANGS}; do
# Run the build process in background
( %__make -j4 || %__make || echo TDE_Error ) &
-
+
# Do not build more than 4 languages at the same time
while [ $(jobs | wc -l) -ge 4 ]; do sleep 3; done
popd
diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec
index 81b17e82c..5bd132298 100644
--- a/redhat/main/tdeedu/tdeedu.spec
+++ b/redhat/main/tdeedu/tdeedu.spec
@@ -109,9 +109,13 @@ BuildRequires: %{python}-devel
# BOOST support
BuildRequires: boost-devel
+%if 0%{?mgaversion} >= 7
+BuildRequires: %{_lib}boost_python3-devel
+%endif
%if 0%{?suse_version}
BuildRequires: libboost_%{python}-devel
-%else
+%endif
+%if 0%{?fedora} || 0%{?rhel}
BuildRequires: boost-%{python}-devel
%endif
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 08:25:29 +0000