rpms/bickley/devel 0001-Port-to-gupnp-0.13.patch, 1.1, 1.2 bickley.spec, 1.4, 1.5

[Bastien Nocera]

Author: hadess

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

Modified Files:
	0001-Port-to-gupnp-0.13.patch bickley.spec 
Log Message:
* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 0.4.3-10
- Update gupnp 0.13 patch


0001-Port-to-gupnp-0.13.patch:
 configure.ac          |    2 
 src/bkl-finder-upnp.c |  114 ++++++++++++++++++++++----------------------------
 2 files changed, 52 insertions(+), 64 deletions(-)

Index: 0001-Port-to-gupnp-0.13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bickley/devel/0001-Port-to-gupnp-0.13.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Port-to-gupnp-0.13.patch	18 Sep 2009 10:25:20 -0000	1.1
+++ 0001-Port-to-gupnp-0.13.patch	18 Sep 2009 13:05:42 -0000	1.2
@@ -1,4 +1,4 @@
-From 14f1f145812962a1a0c6c2ad02a1509c1e439158 Mon Sep 17 00:00:00 2001
+From 5bd0f4e4a6ed221a8ca053765d837b4a305a5d94 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Fri, 18 Sep 2009 11:20:20 +0100
 Subject: [PATCH] Port to gupnp 0.13
@@ -22,10 +22,10 @@ index 6df3153..4959fee 100644
  PKG_CHECK_MODULES(INVESTIGATOR, glib-2.0 gio-2.0 dbus-glib-1 >= 0.78 gstreamer-0.10 >= 0.10.20 libexif gdk-pixbuf-2.0)
  
 diff --git a/src/bkl-finder-upnp.c b/src/bkl-finder-upnp.c
-index 5928c45..e5cc005 100644
+index 5928c45..be29d14 100644
 --- a/src/bkl-finder-upnp.c
 +++ b/src/bkl-finder-upnp.c
-@@ -72,60 +72,53 @@ static char *
+@@ -72,60 +72,51 @@ static char *
  get_http_get_props (GList *didl_props,
                      char **mimetype,
                      char **protocol_info,
@@ -38,13 +38,11 @@ index 5928c45..e5cc005 100644
 -        char *pi;
 +        GUPnPDIDLLiteResource *res = p->data;
 +        GUPnPProtocolInfo *pi;
-+        const char *pi_str;
  
 -        pi = gupnp_didl_lite_property_get_attribute (p->data, "protocolInfo");
 -        if (strncmp (pi, "http-get:", 9) == 0) {
 +	pi = gupnp_didl_lite_resource_get_protocol_info (res);
-+	pi_str = gupnp_protocol_info_to_string (pi);
-+        if (strncmp (pi_str, "http-get:", 9) == 0) {
++	if (strcmp (gupnp_protocol_info_get_protocol (pi), "http-get") == 0) {
              if (mimetype) {
 -                char *start, *end;
 -
@@ -62,7 +60,7 @@ index 5928c45..e5cc005 100644
 -                *protocol_info = pi;
 -            } else {
 -                g_free (pi);
-+                *protocol_info = g_strdup (pi_str);
++                *protocol_info = g_strdup (gupnp_protocol_info_to_string (pi));
              }
  
              if (size) {
@@ -104,7 +102,7 @@ index 5928c45..e5cc005 100644
  
              if (prop) {
                  ret = prop;
-@@ -140,19 +133,19 @@ get_property_keys (xmlNode    *didl_object,
+@@ -140,19 +131,21 @@ get_property_keys (xmlNode    *didl_object,
  }
  
  static void
@@ -116,6 +114,8 @@ index 5928c45..e5cc005 100644
      GPtrArray *artists;
  
 -    props = gupnp_didl_lite_object_get_property (didl_object, "artist");
++    /* FIXME: use "artists" property:
++     * http://bugzilla.openedhand.com/show_bug.cgi?id=1814 */
 +    props = gupnp_didl_lite_object_get_properties (didl_object, "artist");
      if (props) {
          GList *p;


Index: bickley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bickley/devel/bickley.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bickley.spec	18 Sep 2009 10:25:20 -0000	1.4
+++ bickley.spec	18 Sep 2009 13:05:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           bickley
 Version:        0.4.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A meta data management API and framework
 
 Group:          Applications/Multimedia
@@ -129,6 +129,9 @@ gconftool-2 --makefile-install-rule \
 %{_libdir}/libkozo.so
 
 %changelog
+* Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 0.4.3-10
+- Update gupnp 0.13 patch
+
 * Fri Sep 18 2009 Bastien Nocera <bnocera at redhat.com> 0.4.3-9
 - Port to gupnp 0.13