diff options
| author | albator <albator@arcadia.vtf> | 2011-09-13 19:34:56 +0200 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-09-13 19:34:56 +0200 |
| commit | f6ce92a24ffe2ccb16db56a14655a01e0caf106a (patch) | |
| tree | aa72f5c520bb790af473dfd5e9885c15ab88e22b /redhat/kdeedu | |
| parent | 2c6d0dac8cc0d0022626d0ab12179131a89037fc (diff) | |
| download | tde-packaging-f6ce92a24ffe2ccb16db56a14655a01e0caf106a.tar.gz tde-packaging-f6ce92a24ffe2ccb16db56a14655a01e0caf106a.zip | |
Add kdeutils patches from Fedora8.
Updated TDE 3.5.12 Spec file, confirmed working on RHEL6 and Fedora15.
Diffstat (limited to 'redhat/kdeedu')
| -rw-r--r-- | redhat/kdeedu/trinity-kdeedu-3.5.12.spec | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.12.spec b/redhat/kdeedu/trinity-kdeedu-3.5.12.spec index ea7d9774f..dd7df51eb 100644 --- a/redhat/kdeedu/trinity-kdeedu-3.5.12.spec +++ b/redhat/kdeedu/trinity-kdeedu-3.5.12.spec @@ -90,7 +90,7 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n kdeedu -%if 0%{?rhel} > 1 +%if 0%{?rhel} > 0 rm -rf doc/kgeography kgeography perl -pi -e "s|kgeography||" subdirs %endif @@ -108,6 +108,10 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" # Fix link with kparts export CXXFLAGS="${CXXFLAGS} -lkparts" +%if 0%{?fedora} +export CXXFLAGS="${CXXFLAGS} -fpermissive" +%endif + %configure \ --enable-new-ldflags \ --disable-dependency-tracking \ @@ -116,6 +120,7 @@ export CXXFLAGS="${CXXFLAGS} -lkparts" --disable-debug \ --disable-warnings \ --enable-final \ + --enable-closure \ --includedir=%{_includedir}/kde \ --disable-ocamlsolver \ --with-extra-includes=%{_includedir}/tqt @@ -126,6 +131,7 @@ export CXXFLAGS="${CXXFLAGS} -lkparts" %install +export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} %make_install |