[rpms/xine-lib] epel9-next: * Fri Feb 20 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.2-3

[rpms/xine-lib] epel9-next: * Fri Feb 20 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.2-3

[Rex Dieter]

            A new commit has been pushed.

            Repo   : rpms/xine-lib
            Branch : epel9-next
            Commit : f7820e51d62cae32f078b18f860c560c2554febe
            Author : Rex Dieter <rdieter@fedoraproject.org>
            Date   : 2009-02-20T13:37:39+00:00
            Stats  : +24/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/xine-lib/c/f7820e51d62cae32f078b18f860c560c2554febe?branch=epel9-next

            Log:
            * Fri Feb 20 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.2-3
- xine-lib-devel muiltilib conflict (#477226)

---
diff --git a/xine-lib-1.1.16.2-multilib.patch b/xine-lib-1.1.16.2-multilib.patch
new file mode 100644
index 0000000..4609e63
--- /dev/null
+++ b/xine-lib-1.1.16.2-multilib.patch
@@ -0,0 +1,16 @@
+diff -up xine-lib-1.1.16.2/misc/xine-config.in.multilib xine-lib-1.1.16.2/misc/xine-config.in
+--- xine-lib-1.1.16.2/misc/xine-config.in.multilib	2008-06-25 08:04:09.000000000 -0500
++++ xine-lib-1.1.16.2/misc/xine-config.in	2009-02-20 07:34:27.000000000 -0600
+@@ -6,12 +6,6 @@ unset prefix
+ unset exec_prefix
+ unset args
+ 
+-PKG_CONFIG_PATH="`cat <<'EOF'
+-@XINE_PKGCONFIG_DIR@
+-EOF
+-`${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH"
+-export PKG_CONFIG_PATH
+-
+ usage()
+ {
+ 	cat <<EOF

diff --git a/xine-lib.spec b/xine-lib.spec
index ba2b3bf..aa0ffe4 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -34,7 +34,7 @@
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -53,6 +53,8 @@ Patch6:         %{name}-1.1.1-deepbind-939.patch
 Patch7:         %{name}-1.1.16-old-caca.patch
 # http://bugzilla.redhat.com/470568
 Patch8:         xine-lib-1.1.15-avsync_hack.patch
+# http://bugzilla.redhat.com/477226
+Patch9:         xine-lib-1.1.16.2-multilib.patch
 ## upstream patches
 Patch100:	xine-lib-safe-audio-pause3.patch
 
@@ -205,6 +207,7 @@ sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure
 %endif
 
 %patch8 -p1 -b .avsync_hack
+%patch9 -p1 -b .multilib
 
 %patch100 -p1 -b .safe_audio_pause
 
@@ -439,8 +442,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 20 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.2-3
+- xine-lib-devel muiltilib conflict (#477226)
+
 * Tue Feb 17 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.2-2
-- xine-lib-safe-audio-pause3 patch (kdebug#180339)
+- xine-lib-safe-audio-pause3 patch (#486255, kdebug#180339)
 
 * Tue Feb 10 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.1.16.2-1.1
 - also patch the caca version check in configure(.ac)