rpms/libvorbis/devel libvorbis-1.0-m4.patch, 1.2, 1.3 libvorbis.spec, 1.31, 1.32

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/libvorbis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18099

Modified Files:
	libvorbis-1.0-m4.patch libvorbis.spec 
Log Message:
* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> -1:1.2.0-5
- Fix patch fuzz build failure


libvorbis-1.0-m4.patch:

Index: libvorbis-1.0-m4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvorbis/devel/libvorbis-1.0-m4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libvorbis-1.0-m4.patch	9 Sep 2004 07:52:14 -0000	1.2
+++ libvorbis-1.0-m4.patch	7 Sep 2008 14:55:05 -0000	1.3
@@ -1,6 +1,28 @@
---- libvorbis-1.0/vorbis.m4.m4-patch	2002-07-09 09:08:57.000000000 -0400
-+++ libvorbis-1.0/vorbis.m4	2003-02-21 09:46:34.000000000 -0500
-@@ -20,7 +20,7 @@
+diff -up libvorbis-1.2.0/configure.foo libvorbis-1.2.0/configure
+--- libvorbis-1.2.0/configure.foo	2008-09-07 16:51:15.000000000 +0200
++++ libvorbis-1.2.0/configure	2008-09-07 16:51:24.000000000 +0200
+@@ -19936,7 +19936,7 @@ fi
+   elif test "x$ogg_prefix" != "x" ; then
+     OGG_LIBS="-L$ogg_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    OGG_LIBS="-L$prefix/lib"
++    OGG_LIBS="-L$libdir"
+   fi
+ 
+   OGG_LIBS="$OGG_LIBS -logg"
+@@ -19946,7 +19946,7 @@ fi
+   elif test "x$ogg_prefix" != "x" ; then
+     OGG_CFLAGS="-I$ogg_prefix/include"
+   elif test "x$prefix" != "xNONE"; then
+-    OGG_CFLAGS="-I$prefix/include"
++    OGG_CFLAGS=""
+   fi
+ 
+   { echo "$as_me:$LINENO: checking for Ogg" >&5
+diff -up libvorbis-1.2.0/vorbis.m4.foo libvorbis-1.2.0/vorbis.m4
+--- libvorbis-1.2.0/vorbis.m4.foo	2008-09-07 16:51:15.000000000 +0200
++++ libvorbis-1.2.0/vorbis.m4	2008-09-07 16:51:24.000000000 +0200
+@@ -20,7 +20,7 @@ AC_ARG_ENABLE(vorbistest, [  --disable-v
    elif test "x$vorbis_prefix" != "x" ; then
      VORBIS_LIBS="-L$vorbis_prefix/lib"
    elif test "x$prefix" != "xNONE"; then
@@ -9,7 +31,7 @@
    fi
  
    VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ AC_ARG_ENABLE(vorbistest, [  --disable-v
    elif test "x$vorbis_prefix" != "x" ; then
      VORBIS_CFLAGS="-I$vorbis_prefix/include"
    elif test "x$prefix" != "xNONE"; then
@@ -18,23 +40,3 @@
    fi
  
  
---- libvorbis-1.0/configure.m4-patch	2002-07-19 08:26:08.000000000 -0400
-+++ libvorbis-1.0/configure	2003-02-21 09:46:22.000000000 -0500
-@@ -5704,7 +5704,7 @@
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_LIBS="-L$ogg_prefix/lib"
-   elif test "x$prefix" != "xNONE" ; then
--    OGG_LIBS="-L$prefix/lib"
-+    OGG_LIBS="-L$libdir"
-   fi
- 
-   OGG_LIBS="$OGG_LIBS -logg"
-@@ -5714,7 +5714,7 @@
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_CFLAGS="-I$ogg_prefix/include"
-   elif test "x$prefix" != "xNONE"; then
--    OGG_CFLAGS="-I$prefix/include"
-+    OGG_CFLAGS=""
-   fi
- 
-   echo $ac_n "checking for Ogg""... $ac_c" 1>&6


Index: libvorbis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvorbis/devel/libvorbis.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libvorbis.spec	14 May 2008 09:38:36 -0000	1.31
+++ libvorbis.spec	7 Sep 2008 14:55:05 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.2.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
@@ -91,6 +91,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> -1:1.2.0-5
+- Fix patch fuzz build failure
+
 * Wed May 14 2008 Jindrich Novy <jnovy at redhat.com> - 1:1.2.0-4
 - fix CVE-2008-1420, CVE-2008-1419, CVE-2008-1423 (#446344)