From 6ce3ba5e5d1eb4e8840a0669ad258bc7884b59205efac508fb94adb3507ae823 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 16 Nov 2009 09:51:26 +0000
Subject: [PATCH] Accepting request 24114 from multimedia:libs

Copy from multimedia:libs/libogg based on submit request 24114 from user tiwai

OBS-URL: https://build.opensuse.org/request/show/24114
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libogg?expand=0&rev=10
---
 configure.dif  | 10 ++++++----
 lib64.dif      | 14 ++++++++------
 libogg.changes |  5 +++++
 libogg.spec    |  2 +-
 m4.diff        | 16 +++++++++-------
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/configure.dif b/configure.dif
index 330a61a..d8fa01d 100644
--- a/configure.dif
+++ b/configure.dif
@@ -1,6 +1,8 @@
---- configure.in-dist	2004-09-23 15:30:58.000000000 +0200
-+++ configure.in	2005-07-07 15:41:01.000000000 +0200
-@@ -45,9 +45,9 @@
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -45,9 +45,9 @@ if test -z "$GCC"; then
  else
          case $host in 
          *-*-linux*)
@@ -12,4 +14,4 @@
 +                PROFILE="-Wall -W -pg -g -ffast-math"
  		;;
          sparc-sun-*)
-                 DEBUG="-g -Wall -fsigned-char -mv8"
+                 sparc_cpu=""
diff --git a/lib64.dif b/lib64.dif
index cfeebde..b52a519 100644
--- a/lib64.dif
+++ b/lib64.dif
@@ -1,8 +1,10 @@
---- ogg.m4
-+++ ogg.m4	2002/06/10 16:59:51
-@@ -17,9 +17,9 @@
-   if test "x$ogg_libraries" != "x" ; then
-     OGG_LIBS="-L$ogg_libraries"
+Index: ogg.m4
+===================================================================
+--- ogg.m4.orig
++++ ogg.m4
+@@ -19,9 +19,9 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--
+   elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
+     OGG_LIBS=""
    elif test "x$ogg_prefix" != "x" ; then
 -    OGG_LIBS="-L$ogg_prefix/lib"
 +    OGG_LIBS="-L$ogg_prefix/lib64"
@@ -11,4 +13,4 @@
 +    OGG_LIBS="-L$prefix/lib64"
    fi
  
-   OGG_LIBS="$OGG_LIBS -logg"
+   if test "x$ogg_prefix" != "xno" ; then
diff --git a/libogg.changes b/libogg.changes
index 0f5af12..98ec62c 100644
--- a/libogg.changes
+++ b/libogg.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov  3 19:09:28 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
 -------------------------------------------------------------------
 Sat Aug  1 17:28:33 CEST 2009 - beineri@opensuse.org
 
diff --git a/libogg.spec b/libogg.spec
index 8a51c63..cc91603 100644
--- a/libogg.spec
+++ b/libogg.spec
@@ -22,7 +22,7 @@ Name:           libogg
 BuildRequires:  pkgconfig
 Summary:        Ogg Bitstream Library
 Version:        1.1.4
-Release:        1
+Release:        2
 # bug437293
 %ifarch ppc64
 Obsoletes:      libogg-64bit
diff --git a/m4.diff b/m4.diff
index 0033961..c4cf13c 100644
--- a/m4.diff
+++ b/m4.diff
@@ -1,7 +1,9 @@
---- ogg.m4-dist	2003-03-08 03:44:29.000000000 +0100
-+++ ogg.m4	2004-01-09 16:50:52.000000000 +0100
-@@ -18,7 +18,7 @@
-     OGG_LIBS="-L$ogg_libraries"
+Index: ogg.m4
+===================================================================
+--- ogg.m4.orig
++++ ogg.m4
+@@ -20,7 +20,7 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--
+     OGG_LIBS=""
    elif test "x$ogg_prefix" != "x" ; then
      OGG_LIBS="-L$ogg_prefix/lib"
 -  elif test "x$prefix" != "xNONE" ; then
@@ -9,8 +11,8 @@
      OGG_LIBS="-L$prefix/lib"
    fi
  
-@@ -28,7 +28,7 @@
-     OGG_CFLAGS="-I$ogg_includes"
+@@ -34,7 +34,7 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--
+     OGG_CFLAGS=""
    elif test "x$ogg_prefix" != "x" ; then
      OGG_CFLAGS="-I$ogg_prefix/include"
 -  elif test "x$prefix" != "xNONE"; then
@@ -18,7 +20,7 @@
      OGG_CFLAGS="-I$prefix/include"
    fi
  
-@@ -51,7 +51,7 @@
+@@ -62,7 +62,7 @@ dnl
  #include <string.h>
  #include <ogg/ogg.h>