summaryrefslogtreecommitdiffstats
path: root/redhat/core/tdebindings/tdebindings.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/core/tdebindings/tdebindings.spec')
-rw-r--r--redhat/core/tdebindings/tdebindings.spec26
1 files changed, 16 insertions, 10 deletions
diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
index f194d330e..937692612 100644
--- a/redhat/core/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -27,7 +27,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.2
+%define tde_version 14.1.3
%endif
%define tde_pkg tdebindings
%define tde_prefix /opt/trinity
@@ -107,7 +107,7 @@ Requires: evolution28-pango
BuildRequires: evolution28-atk-devel
Requires: evolution28-atk
%else
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
BuildRequires: %{_lib}gtk+2.0-devel
%else
BuildRequires: gtk2-devel
@@ -164,16 +164,15 @@ BuildRequires: gdk-pixbuf-devel
%endif
# MESA support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
-BuildRequires: %{_lib}glu-devel
-%else
-BuildRequires: mesaglu-devel
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}mesaglu1-devel
%endif
+%if 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}glu-devel
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
@@ -698,7 +697,7 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-)
%{python_sitearch}/pcop.la
%{python_sitearch}/pcop.so
-%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/pydcop.py*
%if 0%{?rhel} == 7
%{python_sitearch}/__pycache__/pydcop.*.pyc
@@ -1088,7 +1087,7 @@ exit 2
exit 3
%endif
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
touch config.h.in
%endif
@@ -1240,6 +1239,13 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop"
%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
+# Move dcoppython to %python_sitearch
+if [ ! -d "%{?buildroot}%{python_sitearch}" ] && [ -d "%{?buildroot}%{python_sitelib}" ]; then
+ %__mkdir_p "%{?buildroot}%{python_sitearch}"
+ %__mv -f "%{?buildroot}%{python_sitelib}/"{pcop.la,pcop.so,pydcop.py} "%{?buildroot}%{python_sitearch}"
+ rmdir "%{?buildroot}%{python_sitelib}"
+fi
+
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -u kjscmd Development