Merge branch 'master' of ssh://pkgs.fedoraproject.org/xine-lib into f15

.gitignore

@@ -1,3 +1,4 @@
 xine-lib-1.1.19-autotools.patch.bz2
 xine-lib-1.1.19-pruned.tar.bz2
 /xine-lib-1.1.20-pruned.tar.xz
+/xine-lib-1.1.20.1-pruned.tar.xz

sources

@@ -1 +1 @@
-0a916dc5456276402ab2002dd68ded50  xine-lib-1.1.20-pruned.tar.xz
+46d9f91395feb50237ac385aa6654b26  xine-lib-1.1.20.1-pruned.tar.xz

xine-lib-1.1.20-link-libdvdread.patch

@@ -1,11 +0,0 @@
-diff -ur xine-lib-1.1.20/configure.ac xine-lib-1.1.20-link-libdvdread/configure.ac
---- xine-lib-1.1.20/configure.ac	2011-11-13 02:36:20.000000000 +0100
-+++ xine-lib-1.1.20-link-libdvdread/configure.ac	2011-11-20 05:46:16.000000000 +0100
-@@ -1773,6 +1773,7 @@
-   AM_PATH_DVDNAV(0.1.9,
- 	  AC_DEFINE(HAVE_DVDNAV,1,[Define this if you have a suitable version of libdvdnav]),
- 	  [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])])
-+  AC_CHECK_LIB(dvdread, navRead_DSI, DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread",)
- else
-   AC_MSG_RESULT([Use included DVDNAV support])
- fi

xine-lib.spec

@@ -25,7 +25,7 @@
 
 Summary:        A multimedia engine
 Name:           xine-lib
-Version:        1.1.20
+Version:        1.1.20.1
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
@@ -43,9 +43,6 @@ Patch1:         xine-lib-1.1.4-optflags.patch
 Patch8:         xine-lib-1.1.17-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
-# fix system libdvdnav support to also link libdvdread
-# otherwise, we get unresolved symbols in the spudec plugin
-Patch10:        xine-lib-1.1.20-link-libdvdread.patch
 
 Provides:         xine-lib(plugin-abi) = %{plugin_abi}
 %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
@@ -146,7 +143,6 @@ rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
 %patch1 -p1 -b .optflags
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
-%patch10 -p1 -b .link-libdvdread
 
 ./autogen.sh noconfig
 
@@ -377,6 +373,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan 03 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.20.1-1
+- update to 1.1.20.1 (bugfix release)
+- drop upstreamed link-libdvdread patch
+
 * Sun Nov 20 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.20-1
 - update to 1.1.20 (#753758)
 - use .xz tarball