RPM: various fixes for opensuse

pull/92/head
François Andriot 5 years ago
parent 5695f918a8
commit 01c44ab26b

@ -155,7 +155,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Updates applications categories for openSUSE # Updates applications categories for openSUSE
%if 0%{?suse_version} %if 0%{?suse_version}
%suse_update_desktop_file filelight FileManager %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/filelight.desktop FileManager
%endif %endif

@ -153,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Fix desktop files (openSUSE only) # Fix desktop files (openSUSE only)
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%if 0%{?suse_version} %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 %endif

@ -136,7 +136,6 @@ to use them in another application.
%package tdefile-plugin %package tdefile-plugin
Summary: tdefile-plugin for %{name} Summary: tdefile-plugin for %{name}
Group: Applications/Utilities Group: Applications/Utilities
#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description tdefile-plugin %description tdefile-plugin
%{summary}. %{summary}.
@ -207,10 +206,10 @@ export PATH="%{tde_bindir}:${PATH}"
# Updates applications categories for openSUSE # Updates applications categories for openSUSE
%if 0%{?suse_version} %if 0%{?suse_version}
%suse_update_desktop_file -r kbarcode Utility PrintingUtility %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" Utility PrintingUtility
%suse_update_desktop_file -r kbarcode-batch Utility PrintingUtility %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-batch.desktop" Utility PrintingUtility
%suse_update_desktop_file -r kbarcode-editor Utility PrintingUtility %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-editor.desktop" Utility PrintingUtility
%suse_update_desktop_file -r kbarcode-single Utility PrintingUtility %suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-single.desktop" Utility PrintingUtility
%endif %endif

@ -152,7 +152,7 @@ fi
# Updates applications categories for openSUSE # Updates applications categories for openSUSE
%if 0%{?suse_version} %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 %endif

@ -150,7 +150,7 @@ fi
# Updates applications categories for openSUSE # Updates applications categories for openSUSE
%if 0%{?suse_version} %if 0%{?suse_version}
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" 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 %endif

@ -149,7 +149,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Fix desktop files (openSUSE only) # Fix desktop files (openSUSE only)
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%if 0%{?suse_version} %if 0%{?suse_version}
%suse_update_desktop_file kcpuload System Monitor %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System Monitor
%endif %endif

@ -153,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Updates applications categories for openSUSE # Updates applications categories for openSUSE
%if 0%{?suse_version} %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 %endif

@ -157,7 +157,7 @@ EOF
# Updates applications categories for openSUSE # Updates applications categories for openSUSE
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%if 0%{?suse_version} %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 %endif

@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Updates applications categories for openSUSE # Updates applications categories for openSUSE
%if 0%{?suse_version} %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 %endif

@ -83,7 +83,7 @@ BuildRequires: brp-check-trinity
#BuildRequires: scons #BuildRequires: scons
# PYTHON support # 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
%define __python %__python2 %define __python %__python2
%else %else

@ -141,7 +141,7 @@ BuildRequires: xscreensaver-gl
%endif %endif
# PYTHON # 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
%define __python %__python2 %define __python %__python2
%else %else

@ -83,7 +83,7 @@ BuildRequires: esound-devel
%endif %endif
# JACK support # 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 %define with_jack 1
%if 0%{?rhel} >= 5 || 0%{?fedora} %if 0%{?rhel} >= 5 || 0%{?fedora}
%define jack_devel jack-audio-connection-kit-devel %define jack_devel jack-audio-connection-kit-devel

@ -1451,7 +1451,7 @@ for l in %{TDE_LANGS}; do
# Run the build process in background # Run the build process in background
( %__make -j4 || %__make || echo TDE_Error ) & ( %__make -j4 || %__make || echo TDE_Error ) &
# Do not build more than 4 languages at the same time # Do not build more than 4 languages at the same time
while [ $(jobs | wc -l) -ge 4 ]; do sleep 3; done while [ $(jobs | wc -l) -ge 4 ]; do sleep 3; done
popd popd

@ -109,9 +109,13 @@ BuildRequires: %{python}-devel
# BOOST support # BOOST support
BuildRequires: boost-devel BuildRequires: boost-devel
%if 0%{?mgaversion} >= 7
BuildRequires: %{_lib}boost_python3-devel
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: libboost_%{python}-devel BuildRequires: libboost_%{python}-devel
%else %endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: boost-%{python}-devel BuildRequires: boost-%{python}-devel
%endif %endif

Loading…
Cancel
Save