diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-08-05 20:25:18 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-08-05 20:25:18 +0200 |
| commit | 562049cd694f6dd0927b9880227fc4f6da008839 (patch) | |
| tree | e939e442f1fb29ff29811ebc02f672ecf62a47c1 /redhat/main/tdebindings/tdebindings-14.0.0.spec | |
| parent | 6253ed4f8177cb33fef709fb7e215ff94e6300c1 (diff) | |
| download | tde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.tar.gz tde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.zip | |
RPM Packaging: massive update
Diffstat (limited to 'redhat/main/tdebindings/tdebindings-14.0.0.spec')
| -rw-r--r-- | redhat/main/tdebindings/tdebindings-14.0.0.spec | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec index 5b02d362b..7306d534c 100644 --- a/redhat/main/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec @@ -1077,12 +1077,21 @@ exit 1 # [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 -%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" -e "s|rb_frame_this_func|rb_frame_last_func|g" +%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \ + -i "korundum/rubylib/korundum/Korundum.cpp" \ + -e "s|rb_frame_this_func|rb_frame_last_func|g" +%endif + +# Another strange FTBFS in RHEL 5 +%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 +%__sed -i "xparts/xpart_notepad/shell_xparthost.cpp" \ + -i "xparts/xpart_notepad/xp_notepad.cpp" \ + -e "/TDEApplication/ s| );|, true, true, true);|" %endif # Disable kmozilla, it does not build with recent xulrunner (missing 'libmozjs.so') %__sed -i "xparts/Makefile.am" \ - -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|" + -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -1150,8 +1159,7 @@ pushd dcopperl CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor # [Bug #348] Ugly hack to modify the man pages directory -sed -i Makefile \ - -e "s|/usr/share/man|%{tde_mandir}|g" +sed -i "Makefile" -e "s|/usr/share/man|%{tde_mandir}|g" %__make OPTIMIZE="$RPM_OPT_FLAGS" ||: popd |