diff options
Diffstat (limited to 'redhat/main')
| -rw-r--r-- | redhat/main/tdeaddons/tdeaddons.spec | 4 | ||||
| -rw-r--r-- | redhat/main/tdeartwork/tdeartwork.spec | 2 | ||||
| -rw-r--r-- | redhat/main/tdebase/tdebase.spec | 8 | ||||
| -rw-r--r-- | redhat/main/tdebindings/tdebindings.spec | 4 | ||||
| -rw-r--r-- | redhat/main/tdepim/tdepim.spec | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec index d190c2ca6..f373b469d 100644 --- a/redhat/main/tdeaddons/tdeaddons.spec +++ b/redhat/main/tdeaddons/tdeaddons.spec @@ -138,9 +138,11 @@ BuildRequires: db4-devel #%endif # PYTHON2 support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7 %global python python2 %global __python %__python2 +%else +%global python python %endif Requires: trinity-atlantikdesigner = %{version}-%{release} diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/main/tdeartwork/tdeartwork.spec index d0141f44b..9fbe494cf 100644 --- a/redhat/main/tdeartwork/tdeartwork.spec +++ b/redhat/main/tdeartwork/tdeartwork.spec @@ -134,7 +134,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif BuildRequires: xscreensaver BuildRequires: xscreensaver-base +%if 0%{?pclinuxos} == 0 BuildRequires: xscreensaver-extrusion +%endif BuildRequires: xscreensaver-gl %endif diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index ef2d11e7f..1a9c51be0 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -628,7 +628,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif BuildRequires: xscreensaver BuildRequires: xscreensaver-base +%if 0%{?pclinuxos} == 0 BuildRequires: xscreensaver-extrusion +%endif BuildRequires: xscreensaver-gl %endif %endif @@ -788,7 +790,7 @@ BuildRequires: libr-devel >= 0.6.0 %endif # RPC support -%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 +%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 || 0%{?pclinuxos} BuildRequires: libtirpc-devel BuildRequires: rpcgen %if 0%{?fedora} @@ -1499,9 +1501,7 @@ TDE applications, particularly those in the TDE base module. %{tde_libdir}/libtdeinit_kxkb.la %{tde_libdir}/libtdeinit_kxkb.so %{tde_libdir}/libkhotkeys_shared.so.* -%if "%{?tde_version}" != "14.0.9" %{tde_tdeappdir}/kdcop.desktop -%endif %{tde_tdeappdir}/keyboard.desktop %{tde_tdeappdir}/keyboard_layout.desktop %{tde_tdeappdir}/khotkeys.desktop @@ -3707,9 +3707,7 @@ popd %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop Graphics Viewer %{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop Applet X-TDE-settings-desktop} %suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager -if [ -r %{?buildroot}%{tde_tdeappdir}/kdcop.desktop ]; then %suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kdcop.desktop System Utility -fi %endif # Icons from TDE Control Center should only be displayed in TDE diff --git a/redhat/main/tdebindings/tdebindings.spec b/redhat/main/tdebindings/tdebindings.spec index 947ee160d..b4d0d9c76 100644 --- a/redhat/main/tdebindings/tdebindings.spec +++ b/redhat/main/tdebindings/tdebindings.spec @@ -169,10 +169,12 @@ BuildRequires: Mesa-libGLU-devel %endif # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7 %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} diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec index a1c3e7cbc..f32a3bda7 100644 --- a/redhat/main/tdepim/tdepim.spec +++ b/redhat/main/tdepim/tdepim.spec @@ -179,7 +179,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif BuildRequires: xscreensaver BuildRequires: xscreensaver-base +%if 0%{?pclinuxos} == 0 BuildRequires: xscreensaver-extrusion +%endif BuildRequires: xscreensaver-gl %endif %endif |