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/applications/koffice | |
| parent | 6253ed4f8177cb33fef709fb7e215ff94e6300c1 (diff) | |
| download | tde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.tar.gz tde-packaging-562049cd694f6dd0927b9880227fc4f6da008839.zip | |
RPM Packaging: massive update
Diffstat (limited to 'redhat/applications/koffice')
| -rw-r--r-- | redhat/applications/koffice/koffice-14.0.0.spec | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 4183bf3eb..16e69a105 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -177,7 +177,6 @@ BuildRequires: libutempter-devel # POPPLER support %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} BuildRequires: poppler-devel >= 0.12 -#BuildRequires: poppler-qt-devel >= 0.12 %endif %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}poppler-devel @@ -185,7 +184,6 @@ BuildRequires: %{_lib}poppler-devel %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 # On RHEL 5, the distro-provided poppler is too old. We built a newer one. BuildRequires: trinity-poppler-devel >= 0.12 -BuildRequires: trinity-poppler-qt3-devel >= 0.12 %endif # POSTGRESQL support @@ -1125,6 +1123,12 @@ RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])') export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" %endif +# FTBFS on RHEL 5 +%if 0%{?rhel} == 5 +%__sed -i "kexi/migration/keximigratetest.cpp" \ + -e "/TDEApplication/ s|\");|\", true, true, true);|" +%endif + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ |