rpms/xine-lib/EL-5 xine-lib-1.1.16.2-multilib.patch, NONE, 1.1 xine-lib.spec, 1.26, 1.27

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30822

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.16.2-multilib.patch 
Log Message:
* Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-3
- xine-lib-devel muiltilib conflict (#477226)


xine-lib-1.1.16.2-multilib.patch:

--- NEW FILE xine-lib-1.1.16.2-multilib.patch ---
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'
- at XINE_PKGCONFIG_DIR@
-EOF
-`${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH"
-export PKG_CONFIG_PATH
-
 usage()
 {
 	cat <<EOF


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xine-lib.spec	19 Feb 2009 18:03:38 -0000	1.26
+++ xine-lib.spec	20 Feb 2009 13:55:46 -0000	1.27
@@ -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 @@
 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 @@
 %endif
 
 %patch8 -p1 -b .avsync_hack
+%patch9 -p1 -b .multilib
 
 %patch100 -p1 -b .safe_audio_pause
 
@@ -439,8 +442,11 @@
 
 
 %changelog
+* Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.2-3
+- xine-lib-devel muiltilib conflict (#477226)
+
 * Tue Feb 17 2009 Rex Dieter <rdieter at 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 at tigcc.ticalc.org> - 1.1.16.2-1.1
 - also patch the caca version check in configure(.ac)