[grilo/rpm: 20/21] Merge commit 'grilo-0.1.18' into rpm

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit e9d63877f2c0bf5732ea83a846d5bd38c65662a4
Merge: 086c9c6 7ea70a3
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Fri Dec 9 13:28:03 2011 +0000

    Merge commit 'grilo-0.1.18' into rpm

 .gitignore                          |    1 +
 AUTHORS                             |    1 +
 NEWS                                |   17 +++++++
 bindings/vala/grilo-0.1-custom.vala |   60 ++++++++++++------------
 bindings/vala/grilo-0.1.metadata    |    5 ++
 configure.ac                        |   24 ++++++---
 libs/net/Makefile.am                |   15 +-----
 libs/net/grl-net-wc.c               |   24 ++++++++-
 libs/net/wc-test.c                  |   90 -----------------------------------
 src/Makefile.am                     |    3 +
 src/grilo.c                         |   35 +++++++++++--
 src/grl-media-source.c              |    4 +-
 src/grl-metadata-source.c           |    2 +-
 src/grl-multiple.c                  |    2 +-
 src/grl-plugin-registry.c           |    4 +-
 src/grl-util.h                      |    2 +-
 tools/grilo-inspect/Makefile.am     |    1 -
 tools/grilo-test-ui/Makefile.am     |    1 -
 18 files changed, 133 insertions(+), 158 deletions(-)
---
diff --cc configure.ac
index 181a810,e80f274..e5944f2
--- a/configure.ac
+++ b/configure.ac
@@@ -251,8 -257,11 +257,12 @@@ AC_SUBST([builddir]
  # OUTPUT
  # ----------------------------------------------------------
  
+ if test "x$HAVE_LIBSOUP" = "xyes"; then
+    AC_CONFIG_FILES([grilo-net-uninstalled.pc grilo-net-0.1.pc])
+ fi
+ 
  AC_CONFIG_FILES([
 +  grilo.spec
    Makefile
    grilo-uninstalled.pc
    grilo-0.1.pc