diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-07-20 13:29:57 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-07-20 13:29:57 +0200 |
| commit | e07b6bd3c5e686f60224c2cbd7f49a05becd7676 (patch) | |
| tree | 3de95a0eacf9510fb7e0b004fec0fa674e5c63b4 /redhat/tdelibs | |
| parent | a7609c87e47b1a8bfafef1bab3d796770ba2f841 (diff) | |
| download | tde-packaging-e07b6bd3c5e686f60224c2cbd7f49a05becd7676.tar.gz tde-packaging-e07b6bd3c5e686f60224c2cbd7f49a05becd7676.zip | |
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/tdelibs')
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index fa2ada3b3..f2d03d1ca 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -74,13 +74,6 @@ BuildRequires: glib2-devel # LIBART_LGPL support BuildRequires: trinity-libart-lgpl-devel -# ELFICON support -# It's an Ubuntu gadget, not useful for us. -%if 0 -%define with_elficon 1 -BuildRequires: libr-devel -%endif - # ASPELL support BuildRequires: aspell BuildRequires: aspell-devel @@ -122,7 +115,7 @@ BuildRequires: libudev-devel %endif # UDISKS support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6 %define with_udisks 1 BuildRequires: udisks-devel Requires: udisks @@ -132,9 +125,9 @@ Requires: udisks #Requires: pmount # UDISKS2 support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7 %define with_udisks2 1 -%if 0%{?fedora} >= 20 +%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 BuildRequires: libudisks2-devel %else BuildRequires: udisks2-devel @@ -143,19 +136,19 @@ Requires: udisks2 %endif # DEVICEKIT POWER support -%if 0%{?rhel} >= 6 +%if 0%{?rhel} == 6 %define with_devkitpower 1 Requires: DeviceKit-power %endif # UPOWER support -%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7 %define with_upower 1 Requires: upower %endif # SYSTEMD support -%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7 %define with_systemd 1 %endif |