[kdenetwork] - build kppp with -fno-strict-aliasing - fix multilib issue

[Than Ngo]

commit 09c82298c60d6d45a7c77b8413e2b42292c07f40
Author: Than Ngo <than at redhat.com>
Date:   Mon Apr 29 15:58:25 2013 +0200

    - build kppp with -fno-strict-aliasing
    - fix multilib issue

 kdenetwork-4.10-kppp-strict-aliasing.patch |   11 +++++++++++
 kdenetwork.spec                            |   19 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/kdenetwork-4.10-kppp-strict-aliasing.patch b/kdenetwork-4.10-kppp-strict-aliasing.patch
new file mode 100644
index 0000000..cd1206b
--- /dev/null
+++ b/kdenetwork-4.10-kppp-strict-aliasing.patch
@@ -0,0 +1,11 @@
+diff -up kdenetwork-4.10.2/kppp/CMakeLists.txt.me kdenetwork-4.10.2/kppp/CMakeLists.txt
+--- kdenetwork-4.10.2/kppp/CMakeLists.txt.me	2013-04-29 15:27:25.787305968 +0200
++++ kdenetwork-4.10.2/kppp/CMakeLists.txt	2013-04-29 15:28:00.839987675 +0200
+@@ -1,5 +1,7 @@
+ project(kppp)
+ 
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
++
+ check_include_files(sys/param.h HAVE_SYS_PARAM_H)
+ check_include_files(net/if_ppp.h HAVE_NET_IF_PPP_H)
+ check_include_files(linux/if_ppp.h HAVE_LINUX_IF_PPP_H)
diff --git a/kdenetwork.spec b/kdenetwork.spec
index b0a0943..97912d1 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -2,7 +2,7 @@ Summary: KDE Network Applications
 Name:    kdenetwork
 Epoch:   7
 Version: 4.10.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -30,6 +30,9 @@ Patch3: kdenetwork-4.7.97-fix-for-g++47.patch
 # support USE_SYSTEM_IRIS build option
 Patch4: kdenetwork-4.10.0-kopete_system_iris.patch
 
+# warning: dereferencing type-punned pointer will break strict-aliasing rules
+Patch5: kdenetwork-4.10-kppp-strict-aliasing.patch
+
 ## upstreamable patches
 Patch50: kdenetwork-4.9.5-libjingle_openssl.patch
 # kernel-3.9.0 v4l deprecations
@@ -236,6 +239,7 @@ Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
 %patch2 -p1 -b .resolv-conf-path
 %patch3 -p1 -b .fix-for-g++47
 %patch4 -p1 -b .kopete_system_iris
+%patch5 -p1 -b .strict-aliasing
 %patch50 -p1 -b .libjingle_openssl
 %patch51 -p1 -b .v4l_deprecations
 
@@ -259,6 +263,14 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# fix documentation multilib conflict in index.cache
+for f in kget kopete kppp krdc krfb; do
+   bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache.bz2
+   sed -i -e 's!name="id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
+   sed -i -e 's!#id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
+   bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
+done
+
 # Run kppp through consolehelper
 mkdir -p %{buildroot}%{_sbindir} \
          %{buildroot}%{_sysconfdir}/security/console.apps \
@@ -269,6 +281,7 @@ ln -s consolehelper %{buildroot}%{_bindir}/kppp
 install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/kppp
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/kppp
 
+
 %find_lang kget --with-kde --without-mo
 %find_lang kopete --with-kde --without-mo
 %find_lang kppp --with-kde --without-mo
@@ -516,6 +529,10 @@ fi
 
 
 %changelog
+* Mon Apr 29 2013 Than Ngo <than at redhat.com> - 7:4.10.2-3
+- build kppp with -fno-strict-aliasing
+- fix multilib issue
+
 * Fri Apr 05 2013 Than Ngo <than at redhat.com> - 7:4.10.2-2
 - fix rhel condition