diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:33:09 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:33:09 +0200 |
| commit | dcfb68136c0561ba4bcbef1336ff6f02b49c8900 (patch) | |
| tree | 452dfc902693c31d8b5c4a088c63f56878073862 /redhat/kdepim/trinity-kdepim-3.5.13.spec | |
| parent | f345812d8248f8a1c6a062cb5af470a9f44b0dc0 (diff) | |
| download | tde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.tar.gz tde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.zip | |
RHEL/Fedora: updates main components
Diffstat (limited to 'redhat/kdepim/trinity-kdepim-3.5.13.spec')
| -rw-r--r-- | redhat/kdepim/trinity-kdepim-3.5.13.spec | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index 3cbfc506a..0f93717a4 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -7,7 +7,7 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables @@ -40,6 +40,11 @@ Source0: kdepim-%{version}.tar.gz # [kdepim] Fix compilation with GCC 4.7 [Bug #958] Patch1: kdepim-3.5.13-fix_gcc47_compilation.patch +# [tdepim] Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8] +Patch2: kdepim-3.5.13-fix_check_mail.patch + +# [tdepim] Fix kmail composer crash [Bug #953] +Patch3: kdepim-3.5.13-fix_composer_crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +92,8 @@ Development files for %{name}. %prep %setup -q -n kdepim %patch1 -p1 -b .gcc47 +%patch2 -p1 +%patch3 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -122,8 +129,7 @@ cd build -DBUILD_ALL=ON \ .. -# Do not use %{?_smp_mflags} ! -%__make +%__make %{?_smp_mflags} %install export PATH="%{_bindir}:${PATH}" @@ -172,6 +178,8 @@ export PATH="%{_bindir}:${PATH}" %changelog * Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 - Fix compilation with GCC 4.7 [Bug #958] +- Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8] +- Fix kmail composer crash [Bug #953] * Sun Nov 27 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 - Add missing files '*.la' |