Hello community,
here is the log from the commit of package caja-dropbox for openSUSE:Factory
checked in at 2016-09-25 14:44:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caja-dropbox (Old)
and /work/SRC/openSUSE:Factory/.caja-dropbox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caja-dropbox"
Changes:
--------
--- /work/SRC/openSUSE:Factory/caja-dropbox/caja-dropbox.changes
2016-04-15 19:09:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.caja-dropbox.new/caja-dropbox.changes
2016-09-25 14:44:21.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 20 20:50:25 UTC 2016 - sor.ale...@meowr.ru
+
+- Update to version 1.16.0:
+ * Some code cleanups.
+- Extend caja-dropbox_no-dropbox-bin.patch to dependency check.
+
+-------------------------------------------------------------------
Old:
----
caja-dropbox-1.14.0.tar.xz
New:
----
caja-dropbox-1.16.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caja-dropbox.spec ++++++
--- /var/tmp/diff_new_pack.8aZMDx/_old 2016-09-25 14:44:23.000000000 +0200
+++ /var/tmp/diff_new_pack.8aZMDx/_new 2016-09-25 14:44:23.000000000 +0200
@@ -16,9 +16,9 @@
#
-%define _version 1.14
+%define _version 1.16
Name: caja-dropbox
-Version: 1.14.0
+Version: 1.16.0
Release: 0
Summary: Dropbox client integrated into Caja
License: GPL-3.0+
@@ -29,8 +29,6 @@
Patch0: caja-dropbox_no-dropbox-bin.patch
BuildRequires: hicolor-icon-theme
BuildRequires: mate-common >= %{_version}
-BuildRequires: python-docutils
-BuildRequires: python-gtk
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(libcaja-extension) >= %{_version}
@@ -61,7 +59,8 @@
%build
NOCONFIGURE=1 mate-autogen
-%configure --disable-static
+%configure \
+ --disable-static
make %{?_smp_mflags}
%install
++++++ caja-dropbox-1.14.0.tar.xz -> caja-dropbox-1.16.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-dropbox-1.14.0/ChangeLog
new/caja-dropbox-1.16.0/ChangeLog
--- old/caja-dropbox-1.14.0/ChangeLog 2016-04-08 13:37:35.000000000 +0200
+++ new/caja-dropbox-1.16.0/ChangeLog 2016-09-19 10:57:32.000000000 +0200
@@ -1,3 +1,52 @@
+commit 17ea6236880a7b37e633eba90f5829640c802515
+Author: monsta <mon...@inbox.ru>
+Date: Mon Sep 19 11:56:52 2016 +0300
+
+ release 1.16.0
+
+ NEWS | 4 ++--
+ configure.ac | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 9f9e7672b6b93dd0b49fdff7225fe95fc97eb452
+Author: monsta <mon...@inbox.ru>
+Date: Thu Sep 1 13:42:22 2016 +0300
+
+ drop some checks and code regarding glib < 2.14
+
+ src/dropbox-command-client.c | 18 +-----------------
+ 1 file changed, 1 insertion(+), 17 deletions(-)
+
+commit 65b4b24f46b7712bcfea69ed40930a3795b23116
+Author: monsta <mon...@inbox.ru>
+Date: Thu Sep 1 13:36:03 2016 +0300
+
+ drop some completely unused ancient code
+
+ src/caja-dropbox.c | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+commit 38ffcb06b5abb35f9eb0f444819001a11af45d00
+Author: monsta <mon...@inbox.ru>
+Date: Thu Sep 1 13:25:41 2016 +0300
+
+ drop code that's unused since gnome 2 days
+
+ src/caja-dropbox.c | 8 --------
+ src/caja-dropbox.h | 1 -
+ src/dropbox.c | 1 -
+ 3 files changed, 10 deletions(-)
+
+commit 7f66967ba8cdcd67ad90143bedfc5ece728b040c
+Author: Martin Wimpress <c...@flexion.org>
+Date: Sun Jun 12 15:14:48 2016 +0100
+
+ Bump version to 1.15.0
+
+ NEWS | 5 +++++
+ configure.ac | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
commit 9812760d82e747b427e14851e6fb9842c7b598dc
Author: monsta <mon...@inbox.ru>
Date: Fri Apr 8 14:37:12 2016 +0300
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-dropbox-1.14.0/NEWS new/caja-dropbox-1.16.0/NEWS
--- old/caja-dropbox-1.14.0/NEWS 2016-04-08 13:01:31.000000000 +0200
+++ new/caja-dropbox-1.16.0/NEWS 2016-09-19 10:54:19.000000000 +0200
@@ -1,3 +1,8 @@
+caja-dropbox 1.16.0
+==========================
+
+ * Some code cleanups
+
caja-dropbox 1.14.0
==========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-dropbox-1.14.0/configure
new/caja-dropbox-1.16.0/configure
--- old/caja-dropbox-1.14.0/configure 2016-04-08 13:37:26.000000000 +0200
+++ new/caja-dropbox-1.16.0/configure 2016-09-19 10:57:23.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for caja-dropbox 1.14.0.
+# Generated by GNU Autoconf 2.69 for caja-dropbox 1.16.0.
#
# Report bugs to <http://www.mate-desktop.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='caja-dropbox'
PACKAGE_TARNAME='caja-dropbox'
-PACKAGE_VERSION='1.14.0'
-PACKAGE_STRING='caja-dropbox 1.14.0'
+PACKAGE_VERSION='1.16.0'
+PACKAGE_STRING='caja-dropbox 1.16.0'
PACKAGE_BUGREPORT='http://www.mate-desktop.org/'
PACKAGE_URL=''
@@ -1333,7 +1333,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures caja-dropbox 1.14.0 to adapt to many kinds of systems.
+\`configure' configures caja-dropbox 1.16.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1403,7 +1403,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of caja-dropbox 1.14.0:";;
+ short | recursive ) echo "Configuration of caja-dropbox 1.16.0:";;
esac
cat <<\_ACEOF
@@ -1520,7 +1520,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-caja-dropbox configure 1.14.0
+caja-dropbox configure 1.16.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1798,7 +1798,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by caja-dropbox $as_me 1.14.0, which was
+It was created by caja-dropbox $as_me 1.16.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2662,7 +2662,7 @@
# Define the identity of the package.
PACKAGE='caja-dropbox'
- VERSION='1.14.0'
+ VERSION='1.16.0'
cat >>confdefs.h <<_ACEOF
@@ -12677,7 +12677,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by caja-dropbox $as_me 1.14.0, which was
+This file was extended by caja-dropbox $as_me 1.16.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12743,7 +12743,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-caja-dropbox config.status 1.14.0
+caja-dropbox config.status 1.16.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-dropbox-1.14.0/configure.ac
new/caja-dropbox-1.16.0/configure.ac
--- old/caja-dropbox-1.14.0/configure.ac 2016-04-08 13:37:02.000000000
+0200
+++ new/caja-dropbox-1.16.0/configure.ac 2016-09-19 10:54:41.000000000
+0200
@@ -1,6 +1,6 @@
# Initialization
-AC_INIT([caja-dropbox], [1.14.0], [http://www.mate-desktop.org/])
+AC_INIT([caja-dropbox], [1.16.0], [http://www.mate-desktop.org/])
AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz foreign no-dist-gzip])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-dropbox-1.14.0/install-sh
new/caja-dropbox-1.16.0/install-sh
--- old/caja-dropbox-1.14.0/install-sh 2016-04-08 13:37:27.000000000 +0200
+++ new/caja-dropbox-1.16.0/install-sh 2016-09-19 10:57:24.000000000 +0200
@@ -345,34 +345,41 @@
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
+ # $RANDOM is not portable (e.g. dash); use it when possible to
+ # lower collision chance
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
2>/dev/null; exit $ret' 0
+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
+ # create the $tmpdir first (and fail if unsuccessful) to make sure
+ # that nobody tries to guess the $tmpdir name.
if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/d" "$tmpdir"
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-dropbox-1.14.0/src/caja-dropbox.c
new/caja-dropbox-1.16.0/src/caja-dropbox.c
--- old/caja-dropbox-1.14.0/src/caja-dropbox.c 2016-04-08 12:44:53.000000000
+0200
+++ new/caja-dropbox-1.16.0/src/caja-dropbox.c 2016-09-01 12:35:57.000000000
+0200
@@ -49,26 +49,10 @@
static char *emblems[] = {"dropbox-uptodate", "dropbox-syncing",
"dropbox-unsyncable"};
gchar *DEFAULT_EMBLEM_PATHS[2] = { EMBLEMDIR , NULL };
-gboolean dropbox_use_caja_submenu_workaround;
gboolean dropbox_use_operation_in_progress_workaround;
static GType dropbox_type = 0;
-/* for old versions of glib */
-#if 0 // Silence Warnings.
-static void my_g_hash_table_get_keys_helper(gpointer key,
- gpointer value,
- GList **ud) {
- *ud = g_list_append(*ud, key);
-}
-
-static GList *my_g_hash_table_get_keys(GHashTable *ght) {
- GList *list = NULL;
- g_hash_table_foreach(ght, (GHFunc) my_g_hash_table_get_keys_helper, &list);
- return list;
-}
-#endif
-
/* probably my favorite function */
static gchar *
canonicalize_path(gchar *path) {
@@ -596,13 +580,6 @@
g_object_set_property (G_OBJECT(item), "sensitive", &sensitive);
}
- /* taken from caja-file-repairer (http://repairer.kldp.net/):
- * this code is a workaround for a bug of caja
- * See: http://bugzilla.gnome.org/show_bug.cgi?id=508878 */
- if (dropbox_use_caja_submenu_workaround) {
- toret = g_list_append(toret, item);
- }
-
g_object_unref(item);
g_string_free(new_action_string, TRUE);
ret++;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-dropbox-1.14.0/src/caja-dropbox.h
new/caja-dropbox-1.16.0/src/caja-dropbox.h
--- old/caja-dropbox-1.14.0/src/caja-dropbox.h 2016-04-08 12:44:53.000000000
+0200
+++ new/caja-dropbox-1.16.0/src/caja-dropbox.h 2016-09-01 12:25:22.000000000
+0200
@@ -61,7 +61,6 @@
GType caja_dropbox_get_type(void);
void caja_dropbox_register_type(GTypeModule *module);
-extern gboolean dropbox_use_caja_submenu_workaround;
extern gboolean dropbox_use_operation_in_progress_workaround;
G_END_DECLS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-dropbox-1.14.0/src/dropbox-command-client.c
new/caja-dropbox-1.16.0/src/dropbox-command-client.c
--- old/caja-dropbox-1.14.0/src/dropbox-command-client.c 2016-04-08
12:44:53.000000000 +0200
+++ new/caja-dropbox-1.16.0/src/dropbox-command-client.c 2016-09-01
12:41:29.000000000 +0200
@@ -154,19 +154,6 @@
return TRUE;
}
-static void my_g_hash_table_get_keys_helper(gpointer key,
- gpointer value,
- GList **ud) {
- *ud = g_list_append(*ud, key);
-}
-
-static GList *my_g_hash_table_get_keys(GHashTable *ght) {
- GList *list = NULL;
- g_hash_table_foreach(ght, (GHFunc)
- my_g_hash_table_get_keys_helper, &list);
- return list;
-}
-
/*
sends a command to the dropbox server
returns an hash of the return values
@@ -221,10 +208,7 @@
if (args != NULL) {
GList *keys, *li;
- /* oh god */
- keys = glib_check_version(2, 14, 0)
- ? my_g_hash_table_get_keys(args)
- : g_hash_table_get_keys(args);
+ keys = g_hash_table_get_keys(args);
for (li = keys; li != NULL; li = g_list_next(li)) {
int i;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caja-dropbox-1.14.0/src/dropbox.c
new/caja-dropbox-1.16.0/src/dropbox.c
--- old/caja-dropbox-1.14.0/src/dropbox.c 2016-04-08 12:44:53.000000000
+0200
+++ new/caja-dropbox-1.16.0/src/dropbox.c 2016-09-01 12:24:23.000000000
+0200
@@ -41,7 +41,6 @@
caja_dropbox_register_type (module);
type_list[0] = CAJA_TYPE_DROPBOX;
- dropbox_use_caja_submenu_workaround = FALSE;
dropbox_use_operation_in_progress_workaround = TRUE;
}
++++++ caja-dropbox_no-dropbox-bin.patch ++++++
--- /var/tmp/diff_new_pack.8aZMDx/_old 2016-09-25 14:44:23.000000000 +0200
+++ /var/tmp/diff_new_pack.8aZMDx/_new 2016-09-25 14:44:23.000000000 +0200
@@ -1,3 +1,42 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,36 +30,6 @@ fi
+ PKG_CHECK_MODULES(CAJA, libcaja-extension >= $CAJA_REQUIRED)
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+
+-AC_PATH_PROG([PYTHON], [python])
+-
+-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
+-AC_SUBST(RST2MAN)
+-
+-# define module checking macro
+-AC_DEFUN([PYTHON_CHECK_MODULE], [
+-AC_MSG_CHECKING([for $1])
+-
+-cat <<EOF | python
+-try:
+- import $2
+-except:
+- exit(1)
+-else:
+- exit(0)
+-EOF
+-
+-if test $? -ne 0; then
+- AC_MSG_RESULT([no])
+- AC_MSG_ERROR([couldn't find $1])
+-else
+- AC_MSG_RESULT([yes])
+-fi
+-])
+-
+-PYTHON_CHECK_MODULE(pygtk, gtk)
+-PYTHON_CHECK_MODULE(gobject, gobject)
+-PYTHON_CHECK_MODULE(docutils, docutils)
+-
+ # Make dependency CFLAGS and LIBS available
+ AC_SUBST(CAJA_CFLAGS)
+ AC_SUBST(CAJA_LIBS)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,9 @@
