packages: rhythmbox/rhythmbox.spec, rhythmbox/rhythmbox-libdmapsharing-2.2....

[baggins]

Author: baggins                      Date: Tue Nov 23 23:50:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix libdmapsharing 2.1.x detection

---- Files affected:
packages/rhythmbox:
   rhythmbox.spec (1.146 -> 1.147) , rhythmbox-libdmapsharing-2.2.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/rhythmbox/rhythmbox.spec
diff -u packages/rhythmbox/rhythmbox.spec:1.146 packages/rhythmbox/rhythmbox.spec:1.147
--- packages/rhythmbox/rhythmbox.spec:1.146	Tue Nov 23 06:48:39 2010
+++ packages/rhythmbox/rhythmbox.spec	Wed Nov 24 00:50:53 2010
@@ -18,6 +18,7 @@
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-gtk2.8-crash.patch
 Patch2:		%{name}-pyc.patch
+Patch3:		%{name}-libdmapsharing-2.2.patch
 URL:		http://www.rhythmbox.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -129,9 +130,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-# %patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
+%patch3 -p1
 
 # Pashto not yet supported by (our?) libc
 %{__sed} -i -e 's#ps##' po/LINGUAS
@@ -384,6 +383,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.147  2010/11/23 23:50:53  baggins
+- fix libdmapsharing 2.1.x detection
+
 Revision 1.146  2010/11/23 05:48:39  arekm
 - release 3
 

================================================================
Index: packages/rhythmbox/rhythmbox-libdmapsharing-2.2.patch
diff -u /dev/null packages/rhythmbox/rhythmbox-libdmapsharing-2.2.patch:1.1
--- /dev/null	Wed Nov 24 00:50:58 2010
+++ packages/rhythmbox/rhythmbox-libdmapsharing-2.2.patch	Wed Nov 24 00:50:53 2010
@@ -0,0 +1,11 @@
+--- rhythmbox-0.13.1/configure.ac~	2010-11-24 00:45:22.206982997 +0100
++++ rhythmbox-0.13.1/configure.ac	2010-11-24 00:47:32.807982996 +0100
+@@ -793,7 +793,7 @@
+                              [Disable DAAP support]),,
+               enable_daap=auto)
+ if test "x$enable_daap" != "xno"; then
+-	PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-2.0,
++	PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-2.2,
+ 			  have_libdmapsharing=yes,
+ 			  have_libdmapsharing=no)
+ 	if test "x$have_libdmapsharing" = "xno"; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rhythmbox/rhythmbox.spec?r1=1.146&r2=1.147&f=u