diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-02-16 11:56:41 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-02-16 11:56:41 +0100 |
| commit | 61dd14b2a40d5c7c5430a9e863a2c50384e6c87e (patch) | |
| tree | dd866965a3d41bbee441105edf56cd2d76aa6298 /redhat/tdebindings | |
| parent | fcb296c8c91fff452448d8b1ec446e2aac3d79c1 (diff) | |
| download | tde-packaging-61dd14b2a40d5c7c5430a9e863a2c50384e6c87e.tar.gz tde-packaging-61dd14b2a40d5c7c5430a9e863a2c50384e6c87e.zip | |
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/tdebindings')
| -rw-r--r-- | redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch | 11 | ||||
| -rw-r--r-- | redhat/tdebindings/tdebindings-14.0.0.spec | 14 |
2 files changed, 22 insertions, 3 deletions
diff --git a/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch b/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch new file mode 100644 index 000000000..f7b8d64e3 --- /dev/null +++ b/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch @@ -0,0 +1,11 @@ +--- trinity-tdebindings-14.0.0~pre227+b584f8a9/qtruby/rubylib/qtruby/configure.in.in.ORI 2014-02-04 20:05:36.183889743 +0100 ++++ trinity-tdebindings-14.0.0~pre227+b584f8a9/qtruby/rubylib/qtruby/configure.in.in 2014-02-04 20:05:44.991693984 +0100 +@@ -57,7 +57,7 @@ + RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` + RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'` + RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` +- RUBY_INCLUDEDIR=$RUBY_ARCHDIR ++ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'` + RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` + fi + diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec index 92492b4d2..0ad288c6a 100644 --- a/redhat/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/tdebindings/tdebindings-14.0.0.spec @@ -51,6 +51,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Patch1: tdebindings-14.0.0-ftbfs.patch + # [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL5 Patch5: kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch @@ -81,7 +83,7 @@ BuildRequires: gtk2-devel # XULRUNNER support %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 -BuildRequires: xulrunner-devel +#BuildRequires: xulrunner-devel %endif %if 0%{?suse_version} == 1140 BuildRequires: mozilla-xulrunner20-devel @@ -976,6 +978,7 @@ Development files for the TDE bindings. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .ftbfs %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 %patch5 -p1 -b .ruby @@ -1001,9 +1004,14 @@ unset JAVA_HOME ||: # sip/PyQt/PyKDE built separately, not here export DO_NOT_COMPILE="$DO_NOT_COMPILE python" +# Ruby headers, strange location ... +if [ -d "/usr/include/%{_normalized_cpu}-linux" ]; then + export EXTRA_INCLUDES="/usr/include/%{_normalized_cpu}-linux" +fi + # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi if [ -d /usr/evolution28 ]; then export PATH="/usr/evolution28/bin:${PATH}" @@ -1029,7 +1037,7 @@ fi --enable-rpath \ --disable-gcc-hidden-visibility \ \ - --with-extra-includes=%{_includedir}/tqscintilla \ + --with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \ --with-extra-libs=%{tde_libdir} \ --with-pythondir=%{_usr} \ \ |