diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-12-31 12:26:47 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-12-31 12:26:47 +0100 |
| commit | 5400f0ed760fd9924c19cc9fa2e150039ae201a3 (patch) | |
| tree | 7fc2ad27252f2b0325dcfbf73dfbd2c8a5987f66 /redhat/main | |
| parent | 7f4eeaf4f2bd823bb25a77277de258dac88b8179 (diff) | |
| download | tde-packaging-5400f0ed760fd9924c19cc9fa2e150039ae201a3.tar.gz tde-packaging-5400f0ed760fd9924c19cc9fa2e150039ae201a3.zip | |
RPM Packaging: minor fixes for openSUSE TumbleWeed
Diffstat (limited to 'redhat/main')
| -rw-r--r-- | redhat/main/tdebase/tdebase-14.0.0.spec | 3 | ||||
| -rw-r--r-- | redhat/main/tdebindings/tdebindings-14.0.0.spec | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 2c8c0b313..8473edf0a 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -397,6 +397,9 @@ BuildRequires: libsensors4-devel # TSAK support (requires libudev-devel) # On RHEL5, udev is built statically, so TSAK cannot build. %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?suse_version} >= 1310 +BuildRequires: udev +%endif BuildRequires: libudev-devel %define with_tsak 1 %define with_tdehwlib 1 diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec index 205048bc6..d43a59b54 100644 --- a/redhat/main/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec @@ -1110,18 +1110,21 @@ if [ -d "/usr/include/%{_normalized_cpu}-linux" ]; then fi # Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then +if [ -d "/usr/X11R6" ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -if [ -d /usr/evolution28 ]; then +if [ -d "/usr/evolution28" ]; then export PATH="/usr/evolution28/bin:${PATH}" export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" fi # Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h -%if 0%{?suse_version} >= 1310 +%if 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320 EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}" %endif +%if 0%{?suse_version} >= 1330 +EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}" +%endif # Warning: GCC visibility causes FTBFS [Bug #1285] %configure \ |