diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-08-19 18:59:10 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-08-19 18:59:10 +0200 |
| commit | 24f013d747376aa82d3e1428b269359137b8d2af (patch) | |
| tree | 1504b9276be0a66861b0c4a0b41a80cf26f9d261 /redhat/kdepim | |
| parent | 2c5e188a829058ed023b0c2bdd1b6c78037c50ae (diff) | |
| download | tde-packaging-24f013d747376aa82d3e1428b269359137b8d2af.tar.gz tde-packaging-24f013d747376aa82d3e1428b269359137b8d2af.zip | |
RHEL/Fedora: updates many packaging
Diffstat (limited to 'redhat/kdepim')
| -rw-r--r-- | redhat/kdepim/kdepim-3.5.13-missing_ldflags.patch | 10 | ||||
| -rw-r--r-- | redhat/kdepim/trinity-kdepim-3.5.13.spec | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/redhat/kdepim/kdepim-3.5.13-missing_ldflags.patch b/redhat/kdepim/kdepim-3.5.13-missing_ldflags.patch new file mode 100644 index 000000000..76cea4732 --- /dev/null +++ b/redhat/kdepim/kdepim-3.5.13-missing_ldflags.patch @@ -0,0 +1,10 @@ +--- kdepim/kalarm/CMakeLists.txt.ORI 2012-08-09 19:49:53.033689156 +0200 ++++ kdepim/kalarm/CMakeLists.txt 2012-08-09 19:50:00.301644331 +0200 +@@ -33,6 +33,7 @@ + ${CMAKE_SOURCE_DIR}/certmanager/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ++ ${TDE_INCLUDE_DIR}/../arts + ) + + link_directories( diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index 5cb8ec509..8a9c6d6a6 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -69,6 +69,8 @@ Patch11: kdepim-3.5.13-fix_kalarm_icon_reference.patch Patch12: kdepim-3.5.13-disable_fsync_in_cached_imap.patch # [tdepim] Fix include directory location Patch13: kdepim-3.5.13-fix_include_directory.patch +# [tdepim] Missing LDFLAGS cause FTBFS on MGA2/MDV2011 +Patch14: kdepim-3.5.13-missing_ldflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -2092,11 +2094,12 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -b .addquotes +#patch9 -p1 -b .addquotes %patch10 -p1 -b .segv %patch11 -p1 %patch12 -p1 %patch13 -p1 -b .incdir +%patch14 -p1 -b .ldflags %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -2144,7 +2147,7 @@ cd build -DBUILD_ALL=ON \ .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make VERBOSE=1 %install export PATH="%{_bindir}:${PATH}" |