diff options
Diffstat (limited to 'redhat/libraries')
-rw-r--r-- | redhat/libraries/kipi-plugins/kipi-plugins.spec | 17 | ||||
-rw-r--r-- | redhat/libraries/libkdcraw/libkdcraw.spec | 2 | ||||
-rw-r--r-- | redhat/libraries/libkexiv2/libkexiv2.spec | 2 | ||||
-rw-r--r-- | redhat/libraries/libkipi/libkipi.spec | 2 | ||||
-rw-r--r-- | redhat/libraries/libksquirrel/libksquirrel.spec | 2 | ||||
-rw-r--r-- | redhat/libraries/libtdeldap/libtdeldap.spec | 10 | ||||
-rw-r--r-- | redhat/libraries/libtqt-perl/libtqt-perl.spec | 2 | ||||
-rw-r--r-- | redhat/libraries/pytde/pytde.spec | 4 | ||||
-rw-r--r-- | redhat/libraries/pytdeextensions/pytdeextensions.spec | 2 |
9 files changed, 21 insertions, 22 deletions
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec index 68bc75af8..353b1c1a5 100644 --- a/redhat/libraries/kipi-plugins/kipi-plugins.spec +++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec @@ -22,7 +22,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 kipi-plugins %define tde_prefix /opt/trinity @@ -140,20 +140,15 @@ BuildRequires: libxslt-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%{?pclinuxos} -BuildRequires: MesaGLU-devel -%else -%if 0%{?mdkver} -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel -%endif +%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 diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec index e881fc9b8..b0d1fb88a 100644 --- a/redhat/libraries/libkdcraw/libkdcraw.spec +++ b/redhat/libraries/libkdcraw/libkdcraw.spec @@ -18,7 +18,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 libkdcraw %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec index c44f92c28..e2ba31887 100644 --- a/redhat/libraries/libkexiv2/libkexiv2.spec +++ b/redhat/libraries/libkexiv2/libkexiv2.spec @@ -22,7 +22,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 libkexiv2 %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec index 38e0d979c..869bd2094 100644 --- a/redhat/libraries/libkipi/libkipi.spec +++ b/redhat/libraries/libkipi/libkipi.spec @@ -22,7 +22,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 libkipi %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec index 8168d4711..f0e86d97a 100644 --- a/redhat/libraries/libksquirrel/libksquirrel.spec +++ b/redhat/libraries/libksquirrel/libksquirrel.spec @@ -26,7 +26,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 libksquirrel %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index 80c14f13b..27d29f172 100644 --- a/redhat/libraries/libtdeldap/libtdeldap.spec +++ b/redhat/libraries/libtdeldap/libtdeldap.spec @@ -22,7 +22,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 libtdeldap %define tde_prefix /opt/trinity @@ -78,7 +78,7 @@ BuildRequires: libtool-ltdl-devel # SASL support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}sasl-devel %else BuildRequires: %{_lib}sasl2-devel @@ -90,7 +90,7 @@ BuildRequires: cyrus-sasl-devel # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: lib64ldap-devel %else BuildRequires: openldap-devel @@ -115,7 +115,11 @@ BuildRequires: libheimdal-devel %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/libraries/libtqt-perl/libtqt-perl.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec index 38ad6cce6..dd71de0ce 100644 --- a/redhat/libraries/libtqt-perl/libtqt-perl.spec +++ b/redhat/libraries/libtqt-perl/libtqt-perl.spec @@ -18,7 +18,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 libtqt-perl %define tde_prefix /opt/trinity diff --git a/redhat/libraries/pytde/pytde.spec b/redhat/libraries/pytde/pytde.spec index 23c576859..98c6d90a9 100644 --- a/redhat/libraries/pytde/pytde.spec +++ b/redhat/libraries/pytde/pytde.spec @@ -18,7 +18,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 pytde %define tde_prefix /opt/trinity @@ -93,7 +93,7 @@ from tdeio, tdejs, tdehtml and tdeprint. %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{python_sitearch}/*.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}/dcopexport.py* %{python_sitearch}/dcopext.py* %{python_sitearch}/pytdeconfig.py* diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index 4cbfab470..6eec0582d 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec @@ -18,7 +18,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 pytdeextensions %define tde_prefix /opt/trinity |