summaryrefslogtreecommitdiffstats
path: root/redhat/kdeedu
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-04-26 11:04:39 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-04-26 11:04:39 +0200
commit0ea769c229b62a62ec979554a10bf7a5ab15ab4f (patch)
tree04a94ef7fbea32415492eeacefd6a10a72a3987d /redhat/kdeedu
parent0dc6fc94953ed8de3c717c85c1483b5e738c3e19 (diff)
downloadtde-packaging-0ea769c229b62a62ec979554a10bf7a5ab15ab4f.tar.gz
tde-packaging-0ea769c229b62a62ec979554a10bf7a5ab15ab4f.zip
RHEL/Fedora: updates kdelibs 3.5.13
Diffstat (limited to 'redhat/kdeedu')
-rw-r--r--redhat/kdeedu/trinity-kdeedu-3.5.13.spec17
1 files changed, 10 insertions, 7 deletions
diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
index 6858904fe..b4e88e996 100644
--- a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
+++ b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 2
+%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -34,6 +34,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdeedu-%{version}.tar.gz
+# [kdeedu] Fix compilation with GCC 4.7 [Bug #958]
+Patch1: kdeedu-3.5.13-fix_gcc47_compilation.patch
+
Provides: kdeedu3 = %{version}-%{release}
Requires(post): /sbin/ldconfig
@@ -95,12 +98,13 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n kdeedu
+%patch1 -p1 -b .gcc47
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
- -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
- -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
%if 0%{?rhel} > 0
rm -rf doc/kgeography kgeography
@@ -120,10 +124,6 @@ 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 \
@@ -230,6 +230,9 @@ update-desktop-database >& /dev/null ||:
%changelog
+* Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Fix compilation with GCC 4.7 [Bug #958]
+
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Fix HTML directory location