diff options
author | François Andriot <albator78@libertysurf.fr> | 2015-04-27 10:12:24 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2015-04-27 10:12:24 +0200 |
commit | 4b6d314fd1d6fac2fb82833811ae004f98b0b195 (patch) | |
tree | 4cdac0f668a9d963f5ab7f19514bc6deb9ba3765 /redhat/main | |
parent | 64e1ad0607cad4ecde329bb85e7ebec51802b729 (diff) | |
download | tde-packaging-4b6d314fd1d6fac2fb82833811ae004f98b0b195.tar.gz tde-packaging-4b6d314fd1d6fac2fb82833811ae004f98b0b195.zip |
RPM Packaging: enable xscreensaver on RHEL
Diffstat (limited to 'redhat/main')
-rw-r--r-- | redhat/main/tdeartwork/tdeartwork-14.0.0.spec | 2 | ||||
-rw-r--r-- | redhat/main/tdebase/tdebase-14.0.0.spec | 6 | ||||
-rw-r--r-- | redhat/main/tdeutils/tdeutils-14.0.0.spec | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec index 0eca45c18..3d48c7e6f 100644 --- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec +++ b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec @@ -103,7 +103,7 @@ BuildRequires: libart_lgpl-devel # RHEL 4: disabled # RHEL 6: available in EPEL # RHEL 7: available in NUX -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?suse_version} || 0%{?with_xscreensaver} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 46ab3ce31..b9dddd86e 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -319,8 +319,10 @@ BuildRequires: %{_lib}sasl2-devel BuildRequires: cyrus-sasl-devel %endif -# LIBUSB support +# PAM support BuildRequires: pam-devel + +# LIBUSB support %if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel @@ -397,7 +399,7 @@ BuildRequires: OpenEXR-devel # RHEL 4: disabled # RHEL 6: available in EPEL # RHEL 7: available in NUX -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?suse_version} || 0%{?with_xscreensaver} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec index aac1e1361..7ecbf8d0b 100644 --- a/redhat/main/tdeutils/tdeutils-14.0.0.spec +++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec @@ -133,7 +133,7 @@ BuildRequires: pcre-devel %endif # XSCREENSAVER support -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver} +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} BuildRequires: libXScrnSaver-devel |