RPM: update build scripts for Fedora 27, opensuse TW

2 files changed, 23 insertions, 2 deletions

diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec
index 7e0607e73..3cfbabaeb 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec
@@ -1034,7 +1034,7 @@ fi
 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}"
+EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu"
 %endif
 
 # Warning: GCC visibility causes FTBFS [Bug #1285]
diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
index 7eca7cf4a..5c7e90879 100644
--- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
@@ -195,6 +195,10 @@ BuildRequires: libdrm-devel
 BuildRequires:	OpenEXR-devel
 
 # POPPLER support
+#if 0%{?suse_version} != 1330
+%define with_pdf 1
+#endif
+%if 0%{?with_pdf}
 %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
 BuildRequires: poppler-devel >= 0.12
 %endif
@@ -205,10 +209,15 @@ BuildRequires:	%{_lib}poppler-devel
 # On RHEL 5, the distro-provided poppler is too old. We built a newer one.
 BuildRequires:	trinity-poppler-devel >= 0.12
 %endif
+%endif
 
 # LCMS support
 %if 0%{?suse_version}
+BuildRequires: liblcms2-devel
+%if 0%{?suse_version} == 1330
+%else
 BuildRequires: liblcms-devel
+%endif
 %else
 BuildRequires: lcms-devel
 %endif
@@ -260,7 +269,9 @@ Requires: trinity-ksvg = %{version}-%{release}
 Requires: trinity-kview = %{version}-%{release}
 Requires: trinity-kviewshell = %{version}-%{release}
 Requires: trinity-libkscan = %{version}-%{release}
+%if 0%{?with_pdf}
 Requires: trinity-libpoppler-tqt = %{version}-%{release}
+%endif
 
 %description
 Graphics applications for the Trinity Desktop Environment, including
@@ -364,8 +375,10 @@ tags, etc. all from within the file manager).
 %{tde_tdelibdir}/tdefile_jpeg.so
 %{tde_tdelibdir}/tdefile_pcx.la
 %{tde_tdelibdir}/tdefile_pcx.so
+%if 0%{?with_pdf}
 %{tde_tdelibdir}/tdefile_pdf.la
 %{tde_tdelibdir}/tdefile_pdf.so
+%endif
 %{tde_tdelibdir}/tdefile_png.la
 %{tde_tdelibdir}/tdefile_png.so
 %{tde_tdelibdir}/tdefile_pnm.la
@@ -393,7 +406,9 @@ tags, etc. all from within the file manager).
 %{tde_datadir}/services/tdefile_ico.desktop
 %{tde_datadir}/services/tdefile_jpeg.desktop
 %{tde_datadir}/services/tdefile_pcx.desktop
+%if 0%{?with_pdf}
 %{tde_datadir}/services/tdefile_pdf.desktop
+%endif
 %{tde_datadir}/services/tdefile_png.desktop
 %{tde_datadir}/services/tdefile_pnm.desktop
 %{tde_datadir}/services/tdefile_ps.desktop
@@ -896,6 +911,7 @@ This package contains development files for Trinity's scanner library.
 
 ##########
 
+%if 0%{?with_pdf}
 %package -n trinity-libpoppler-tqt
 Summary:	TQt support for Poppler
 Group:		Productivity/Graphics/Viewers
@@ -911,9 +927,11 @@ This library is used by the Trinity graphics file plugins for PDF support.
 %files -n trinity-libpoppler-tqt
 %defattr(-,root,root,-)
 %{tde_libdir}/libpoppler-tqt.so.*
+%endif
 
 ##########
 
+%if 0%{?with_pdf}
 %package -n trinity-libpoppler-tqt-devel
 Summary:	Development files for TQt support for Poppler
 Group:		Development/Libraries/Other
@@ -935,6 +953,7 @@ This package contains the development files needed to compile applications again
 %{tde_libdir}/libpoppler-tqt.la
 %{tde_libdir}/libpoppler-tqt.so
 %{tde_libdir}/pkgconfig/poppler-tqt.pc
+%endif
 
 ##########
 
@@ -947,7 +966,9 @@ Provides:	trinity-kdegraphics-devel = %{version}-%{release}
 
 Requires: %{name} = %{version}-%{release}
 Requires: trinity-libkscan-devel = %{version}-%{release}
+%if 0%{?with_pdf}
 Requires: trinity-libpoppler-tqt-devel = %{version}-%{release}
+%endif
 
 %description devel
 This package contains the development files needed to compile 
@@ -1049,7 +1070,7 @@ fi
   %{?with_paper:-DWITH_LIBPAPER=ON} \
   -DWITH_TIFF=ON \
   -DWITH_OPENEXR=ON \
-  -DWITH_PDF=ON \
+  -DWITH_PDF=%{?with_pdf:ON}%{?!with_pdf:OFF} \
   -DBUILD_ALL=ON \
   -DBUILD_KUICKSHOW=OFF \
   %{!?build_kmrml:-DBUILD_KMRML=OFF} \