From 5400f0ed760fd9924c19cc9fa2e150039ae201a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 31 Dec 2015 12:26:47 +0100 Subject: RPM Packaging: minor fixes for openSUSE TumbleWeed --- redhat/main/tdebindings/tdebindings-14.0.0.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'redhat/main/tdebindings/tdebindings-14.0.0.spec') 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 \ -- cgit v1.2.1