[libogg] - fixing multilib conflict (#831414)

[Jaromír Cápík]

commit c4052d06faa5e9c7ab88c3f94da15cb0478de5ce
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Tue Apr 9 15:09:18 2013 +0200

    - fixing multilib conflict (#831414)

 libogg-multilib.patch |   17 +++++++++++++++++
 libogg.spec           |    7 ++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/libogg-multilib.patch b/libogg-multilib.patch
new file mode 100644
index 0000000..eec4b3f
--- /dev/null
+++ b/libogg-multilib.patch
@@ -0,0 +1,17 @@
+diff -Naur libogg-1.3.0.orig/configure libogg-1.3.0/configure
+--- libogg-1.3.0.orig/configure	2013-04-09 13:58:06.000000000 +0200
++++ libogg-1.3.0/configure	2013-04-09 14:57:43.143970750 +0200
+@@ -12200,10 +12200,10 @@
+ esac
+ 
+ case 8 in
+-     $ac_cv_sizeof_int) SIZE64="int";;
+-     $ac_cv_sizeof_long) SIZE64="long";;
+-     $ac_cv_sizeof_long_long) SIZE64="long long";;
+      $ac_cv_sizeof_int64_t) SIZE64="int64_t";;
++     $ac_cv_sizeof_long_long) SIZE64="long long";;
++     $ac_cv_sizeof_long) SIZE64="long";;
++     $ac_cv_sizeof_int) SIZE64="int";;
+ esac
+ 
+ if test -z "$SIZE16"; then
diff --git a/libogg.spec b/libogg.spec
index bb91a75..6a0e5de 100644
--- a/libogg.spec
+++ b/libogg.spec
@@ -2,7 +2,7 @@ Summary:        The Ogg bitstream file format library
 Name:           libogg
 Epoch:          2
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.xiph.org/
@@ -10,6 +10,7 @@ URL:            http://www.xiph.org/
 Source:         http://downloads.xiph.org/releases/ogg/%{name}-%{version}.tar.xz
 
 Patch0:		libogg-aarch64.patch
+Patch1:		libogg-multilib.patch
 
 %description
 Libogg is a library for manipulating Ogg bitstream file formats.
@@ -43,6 +44,7 @@ Documentation for developing applications with libogg
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 sed -i "s/-O20/$RPM_OPT_FLAGS/" configure
@@ -86,6 +88,9 @@ mv __installed_docs/ogg __installed_docs/libogg
 %doc __installed_docs/*
 
 %changelog
+* Tue Apr 09 2013 Jaromir Capik <jcapik at redhat.com> - 2:1.3.0-5
+- fixing multilib conflict (#831414)
+
 * Tue Mar 26 2013 Jaromir Capik <jcapik at redhat.com> - 2:1.3.0-4
 - aarch64 support (#925834)
 - minor spec cleaning