[mygui] Combine the pc-fixes patch with the multilibs_cflags patch

[Bruno Wolff III]

commit d765e9ff01be66c13e54a3a1f72940d88de70273
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Tue Dec 4 14:58:03 2012 -0600

    Combine the pc-fixes patch with the multilibs_cflags patch

 mygui-pc-fixes.patch        |   12 ------------
 mygui.spec                  |    3 ---
 mygui_multilib_cflags.patch |    4 +---
 3 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/mygui.spec b/mygui.spec
index 405ef47..6dc64bf 100644
--- a/mygui.spec
+++ b/mygui.spec
@@ -17,8 +17,6 @@ Source3:        resources.xml
 Source4:        mygui-layouteditor.desktop
 # Fix multilib and flags with cmake
 Patch0:         mygui_multilib_cflags.patch
-# Fix pc file issues. 
-Patch4:         mygui-pc-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake, autoconf, libtool, freetype-devel, desktop-file-utils
@@ -85,7 +83,6 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}.
 %prep
 %setup -n MyGUI_%{version}
 %patch0 -p0 -b .multilib
-%patch4 -p1 -b .pc
 # Fix eol 
 sed -i 's/\r//' COPYING.LESSER
 # Fix non-UTF8 files
diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch
index 9d45f04..e873b92 100644
--- a/mygui_multilib_cflags.patch
+++ b/mygui_multilib_cflags.patch
@@ -72,7 +72,7 @@
 +endfunction(mygui_config_sample)
 --- CMake/Templates/MYGUI.pc.in.multilib	2012-12-04 13:45:07.747668743 -0600
 +++ CMake/Templates/MYGUI.pc.in	2012-12-04 14:25:52.928438645 -0600
-@@ -1,11 +1,11 @@
+@@ -1,10 +1,10 @@
  prefix=@MYGUI_PREFIX_PATH@
  exec_prefix=${prefix}
 -libdir=${prefix}/lib
@@ -84,6 +84,4 @@
  Version: @MYGUI_VERSION@
  URL: http://mygui.info
 -Libs: -L${libdir} -lMyGUIEngine at MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@
--Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@
 +Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine at MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@
-+Cflags: -I${includedir} -I${includedir}/MyGUI @MYGUI_CFLAGS@