summaryrefslogtreecommitdiffstats
path: root/redhat/kdepim/trinity-kdepim-3.5.13.spec
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/kdepim/trinity-kdepim-3.5.13.spec
parent0dc6fc94953ed8de3c717c85c1483b5e738c3e19 (diff)
downloadtde-packaging-0ea769c229b62a62ec979554a10bf7a5ab15ab4f.tar.gz
tde-packaging-0ea769c229b62a62ec979554a10bf7a5ab15ab4f.zip
RHEL/Fedora: updates kdelibs 3.5.13
Diffstat (limited to 'redhat/kdepim/trinity-kdepim-3.5.13.spec')
-rw-r--r--redhat/kdepim/trinity-kdepim-3.5.13.spec12
1 files changed, 10 insertions, 2 deletions
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 9482748e2..3cbfc506a 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 3
+%define release 4
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -36,6 +36,11 @@ Summary: PIM (Personal Information Manager) applications
Prefix: %{_prefix}
Source0: kdepim-%{version}.tar.gz
+
+# [kdepim] Fix compilation with GCC 4.7 [Bug #958]
+Patch1: kdepim-3.5.13-fix_gcc47_compilation.patch
+
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tqtinterface-devel
@@ -81,7 +86,7 @@ Development files for %{name}.
%prep
%setup -q -n kdepim
-
+%patch1 -p1 -b .gcc47
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -165,6 +170,9 @@ export PATH="%{_bindir}:${PATH}"
%{_datadir}/cmake/*.cmake
%changelog
+* Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Fix compilation with GCC 4.7 [Bug #958]
+
* Sun Nov 27 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Add missing files '*.la'