Hello community,

here is the log from the commit of package gnome-online-miners for 
openSUSE:Factory checked in at 2015-04-23 08:00:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-online-miners (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-online-miners.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-online-miners"

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-online-miners/gnome-online-miners.changes  
2014-12-17 19:18:32.000000000 +0100
+++ 
/work/SRC/openSUSE:Factory/.gnome-online-miners.new/gnome-online-miners.changes 
    2015-04-23 08:00:21.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Apr 15 07:19:42 UTC 2015 - dims...@opensuse.org
+
+- Update to version 3.14.2:
+  + Add build options to enable/disable each miner (bgo#747847).
+  + gdata: Skip PicasaWeb videos (bgo#740421).
+
+-------------------------------------------------------------------

Old:
----
  gnome-online-miners-3.14.1.tar.xz

New:
----
  gnome-online-miners-3.14.2.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-online-miners.spec ++++++
--- /var/tmp/diff_new_pack.rxjkme/_old  2015-04-23 08:00:21.000000000 +0200
+++ /var/tmp/diff_new_pack.rxjkme/_new  2015-04-23 08:00:21.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-online-miners
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2013 Dominique Leuenberger, Amsterdam, The Netherlands
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
 
 
 Name:           gnome-online-miners
-Version:        3.14.1
+Version:        3.14.2
 Release:        0
 Summary:        Crawls through your online content
 License:        GPL-2.0+

++++++ gnome-online-miners-3.14.1.tar.xz -> gnome-online-miners-3.14.2.tar.xz 
++++++
++++ 2134 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/gnome-online-miners-3.14.1/NEWS new/gnome-online-miners-3.14.2/NEWS
--- old/gnome-online-miners-3.14.1/NEWS 2014-12-15 18:48:13.000000000 +0100
+++ new/gnome-online-miners-3.14.2/NEWS 2015-04-14 17:30:48.000000000 +0200
@@ -1,3 +1,12 @@
+Overview of changes in 3.14.2
+=============================
+
+* Add build options to enable/disable each miner (747847)
+
+* Bugs fixed:
+ 740421 gdata: Skip PicasaWeb videos
+
+
 Overview of changes in 3.14.1
 =============================
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/gnome-online-miners-3.14.1/configure.ac 
new/gnome-online-miners-3.14.2/configure.ac
--- old/gnome-online-miners-3.14.1/configure.ac 2014-12-15 18:48:23.000000000 
+0100
+++ new/gnome-online-miners-3.14.2/configure.ac 2015-04-14 17:29:36.000000000 
+0200
@@ -1,5 +1,5 @@
 AC_INIT([GNOME Online Miners],
-        [3.14.1],
+        [3.14.2],
         [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-online-miners],
         [gnome-online-miners],
         [https://wiki.gnome.org/Projects/GnomeOnlineMiners])
@@ -32,17 +32,55 @@
 
 LT_INIT
 
-PKG_CHECK_MODULES(GDATA, [libgdata >= $GDATA_MIN_VERSION])
-PKG_CHECK_MODULES(GFBGRAPH, [libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION])
 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= $GLIB_MIN_VERSION])
 PKG_CHECK_MODULES(GIO, [gio-2.0 gio-unix-2.0])
 
 PKG_CHECK_MODULES(GOA, [goa-1.0 >= $GOA_MIN_VERSION])
 AC_DEFINE([GOA_API_IS_SUBJECT_TO_CHANGE], [], [We are aware that GOA's API can 
change])
 
-PKG_CHECK_MODULES(GRILO, [grilo-0.2 >= $GRILO_MIN_VERSION])
 PKG_CHECK_MODULES(TRACKER, [tracker-miner-1.0 tracker-sparql-1.0])
-PKG_CHECK_MODULES(ZAPOJIT, [zapojit-0.0 >= $ZAPOJIT_MIN_VERSION])
+
+# Facebook
+AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook], [Enable 
Facebook miner])], [], [enable_facebook=yes])
+if test "$enable_facebook" != "no"; then
+  PKG_CHECK_MODULES(GFBGRAPH, [libgfbgraph-0.2 >= $GFBGRAPH_MIN_VERSION])
+fi
+AM_CONDITIONAL(BUILD_FACEBOOK, [test x$enable_facebook != xno])
+
+# Flickr
+AC_ARG_ENABLE([flickr], [AS_HELP_STRING([--enable-flickr], [Enable Flickr 
miner])], [], [enable_flickr=yes])
+if test "$enable_flickr" != "no"; then
+  PKG_CHECK_MODULES(GRILO, [grilo-0.2 >= $GRILO_MIN_VERSION])
+fi
+AM_CONDITIONAL(BUILD_FLICKR, [test x$enable_flickr != xno])
+
+# Google
+AC_ARG_ENABLE([google], [AS_HELP_STRING([--enable-google], [Enable Google 
miner])], [], [enable_google=yes])
+if test "$enable_google" != "no"; then
+  PKG_CHECK_MODULES(GDATA, [libgdata >= $GDATA_MIN_VERSION])
+fi
+AM_CONDITIONAL(BUILD_GOOGLE, [test x$enable_google != xno])
+
+# Media Server
+AC_ARG_ENABLE([media-server], [AS_HELP_STRING([--enable-media-server],
+                                              [Enable media server miner])],
+                                              [],
+                                              [enable_media_server=yes])
+AM_CONDITIONAL(BUILD_MEDIA_SERVER, [test x$enable_media_server != xno])
+
+# ownCloud
+AC_ARG_ENABLE([owncloud], [AS_HELP_STRING([--enable-owncloud], [Enable 
ownCloud miner])], [], [enable_owncloud=yes])
+AM_CONDITIONAL(BUILD_OWNCLOUD, [test x$enable_owncloud != xno])
+
+# Windows Live
+AC_ARG_ENABLE([windows-live], [AS_HELP_STRING([--enable-windows-live],
+                                              [Enable Windows Live miner])],
+                                              [],
+                                              [enable_windows_live=yes])
+if test "$enable_windows_live" != "no"; then
+  PKG_CHECK_MODULES(ZAPOJIT, [zapojit-0.0 >= $ZAPOJIT_MIN_VERSION])
+fi
+AM_CONDITIONAL(BUILD_WINDOWS_LIVE, [test x$enable_windows_live != xno])
 
 AC_CONFIG_FILES([
 Makefile
@@ -50,3 +88,15 @@
 src/Makefile
 ])
 AC_OUTPUT
+
+echo "
+               gnome-online-miners $VERSION
+             ==============================
+
+            Facebook miner:              ${enable_facebook}
+            Flickr miner:                ${enable_flickr}
+            Google miner:                ${enable_google}
+            Media server miner:          ${enable_media_server}
+            ownCloud miner:              ${enable_owncloud}
+            Windows Live miner:          ${enable_windows_live}
+"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/gnome-online-miners-3.14.1/src/Makefile.am 
new/gnome-online-miners-3.14.2/src/Makefile.am
--- old/gnome-online-miners-3.14.1/src/Makefile.am      2014-09-03 
13:30:17.000000000 +0200
+++ new/gnome-online-miners-3.14.2/src/Makefile.am      2015-04-14 
15:02:58.000000000 +0200
@@ -46,12 +46,12 @@
     $(NULL)
 
 libexec_PROGRAMS = \
+    $(NULL)
+
+if BUILD_FACEBOOK
+
+libexec_PROGRAMS += \
     gom-facebook-miner \
-    gom-flickr-miner \
-    gom-gdata-miner \
-    gom-media-server-miner \
-    gom-owncloud-miner \
-    gom-zpj-miner \
     $(NULL)
 
 gom_facebook_miner_SOURCES = \
@@ -80,6 +80,14 @@
     $(TRACKER_LIBS) \
     $(NULL)
 
+endif # BUILD_FACEBOOK
+
+if BUILD_FLICKR
+
+libexec_PROGRAMS += \
+    gom-flickr-miner \
+    $(NULL)
+
 gom_flickr_miner_SOURCES = \
     gom-flickr-miner-main.c \
     gom-flickr-miner.c \
@@ -106,6 +114,14 @@
     $(TRACKER_LIBS) \
     $(NULL)
 
+endif # BUILD_FLICKR
+
+if BUILD_GOOGLE
+
+libexec_PROGRAMS += \
+    gom-gdata-miner \
+    $(NULL)
+
 gom_gdata_miner_SOURCES = \
     gom-gdata-miner-main.c \
     gom-gdata-miner.c \
@@ -132,6 +148,14 @@
     $(TRACKER_LIBS) \
     $(NULL)
 
+endif # BUILD_GOOGLE
+
+if BUILD_MEDIA_SERVER
+
+libexec_PROGRAMS += \
+    gom-media-server-miner \
+    $(NULL)
+
 gom_media_server_miner_built_sources = \
     gom-dleyna-server-manager.c \
     gom-dleyna-server-manager.h \
@@ -173,6 +197,14 @@
     $(TRACKER_LIBS) \
     $(NULL)
 
+endif # BUILD_MEDIA_SERVER
+
+if BUILD_OWNCLOUD
+
+libexec_PROGRAMS += \
+    gom-owncloud-miner \
+    $(NULL)
+
 gom_owncloud_miner_SOURCES = \
     gom-owncloud-miner-main.c \
     gom-owncloud-miner.c \
@@ -197,6 +229,14 @@
     $(TRACKER_LIBS) \
     $(NULL)
 
+endif # BUILD_OWNCLOUD
+
+if BUILD_WINDOWS_LIVE
+
+libexec_PROGRAMS += \
+    gom-zpj-miner \
+    $(NULL)
+
 gom_zpj_miner_SOURCES = \
     gom-zpj-miner-main.c \
     gom-zpj-miner.c \
@@ -223,6 +263,8 @@
     $(ZAPOJIT_LIBS) \
     $(NULL)
 
+endif # BUILD_WINDOWS_LIVE
+
 BUILT_SOURCES = \
     $(libgom_1_0_la_built_sources) \
     $(gom_media_server_miner_built_sources)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/gnome-online-miners-3.14.1/src/gom-gdata-miner.c 
new/gnome-online-miners-3.14.2/src/gom-gdata-miner.c
--- old/gnome-online-miners-3.14.1/src/gom-gdata-miner.c        2014-12-15 
18:37:38.000000000 +0100
+++ new/gnome-online-miners-3.14.2/src/gom-gdata-miner.c        2015-04-13 
16:00:11.000000000 +0200
@@ -1,6 +1,6 @@
 /*
  * GNOME Online Miners - crawls through your online content
- * Copyright (c) 2011, 2012, 2013, 2014 Red Hat, Inc.
+ * Copyright (c) 2011, 2012, 2013, 2014, 2015 Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -327,9 +327,9 @@
                                  const gchar *parent_resource_urn,
                                  GError **error)
 {
-  GList *media_content;
+  GList *l, *media_contents;
   gchar *resource = NULL, *equipment_resource = NULL;
-  gchar *contact_resource, *date, *identifier;
+  gchar *contact_resource, *date, *identifier = NULL;
   gboolean resource_exists, mtime_changed;
   gint64 new_mtime;
   gint64 timestamp;
@@ -358,6 +358,21 @@
   const gchar *alternate_uri;
 
   id = gdata_entry_get_id (GDATA_ENTRY (photo));
+
+  media_contents = gdata_picasaweb_file_get_contents (photo);
+  for (l = media_contents; l != NULL; l = l->next)
+    {
+      GDataMediaContent *media_content = GDATA_MEDIA_CONTENT (l->data);
+      GDataMediaMedium medium;
+
+      medium = gdata_media_content_get_medium (media_content);
+      if (medium != GDATA_MEDIA_IMAGE)
+        {
+          g_debug ("Skipping %s because medium(%d) is not an image", id, 
medium);
+          goto out;
+        }
+    }
+
   identifier = g_strdup_printf ("google:picasaweb:%s", id);
 
   /* remove from the list of the previous resources */
@@ -427,8 +442,7 @@
   if (*error != NULL)
     goto out;
 
-  media_content = gdata_picasaweb_file_get_contents (photo);
-  mime = gdata_media_content_get_content_type (GDATA_MEDIA_CONTENT 
(media_content->data));
+  mime = gdata_media_content_get_content_type (GDATA_MEDIA_CONTENT 
(media_contents->data));
   gom_tracker_sparql_connection_insert_or_replace_triple
     (job->connection,
      job->cancellable, error,


Reply via email to