Hello community,
here is the log from the commit of package nautilus-sendto
checked in at Thu Apr 13 15:31:59 CEST 2006.
--------
--- GNOME/nautilus-sendto/nautilus-sendto.changes 2006-02-02 16:18:27.000000000 +0100
+++ STABLE/nautilus-sendto/nautilus-sendto.changes 2006-04-12 17:24:42.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Apr 12 17:21:07 CEST 2006 - sbrabec@suse.cz
+
+- Simplified BuildRequires.
+- Applied patches from GNOME Bugzilla (no plugin crash, no family
+ name crash, plugin init fail crash - #165527).
+- Removed obsolete .la files and scriptlets.
+- Improved directory ownership.
+
+-------------------------------------------------------------------
Old:
----
nautilus-sendto-bluetooth-gerror.patch
New:
----
nautilus-sendto-0.4-evolution-fix.diff
nautilus-sendto-0.4-noplugin.patch
nautilus-sendto-bluetooth.patch
nautilus-sendto-include.patch
nst-module-unload-crasher.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nautilus-sendto.spec ++++++
--- /var/tmp/diff_new_pack.FKWgLe/_old 2006-04-13 15:30:50.000000000 +0200
+++ /var/tmp/diff_new_pack.FKWgLe/_new 2006-04-13 15:30:50.000000000 +0200
@@ -5,13 +5,14 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: nautilus-sendto
-BuildRequires: eel-devel evolution-data-server-devel gaim-devel gcc-c++ gnome-bluetooth-devel gnome-common intltool libgnomeprintui-devel libwnck-devel mDNSResponder-devel nautilus-devel perl-XML-Parser update-desktop-files
+BuildRequires: evolution-data-server-devel gaim-devel gnome-bluetooth-devel gnome-common intltool nautilus-devel
+# libwnck-devel eel-devel gcc-c++ libgnomeprintui-devel perl-XML-Parser
%define prefix /opt/gnome
%define sysconfdir /etc%{prefix}
License: GPL
@@ -19,15 +20,22 @@
Autoreqprov: on
Requires: nautilus
Version: 0.4
-Release: 10
+Release: 20
Summary: Integrate Nautilus, Evolution, and Gaim
URL: http://www.es.gnome.org/~telemaco/
Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.4/%{name}-%{version}.tar.bz2
Source1: nautilus-sendto.png
Patch1: nautilus-sendto-icon.patch
Patch2: nautilus-sendto-cs.patch
-Patch3: nautilus-sendto-bluetooth-gerror.patch
+Patch3: nautilus-sendto-bluetooth.patch
Patch4: nautilus-sendto-sv.patch
+Patch5: nautilus-sendto-include.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=321063
+Patch6: nautilus-sendto-0.4-noplugin.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=317081
+Patch7: nautilus-sendto-0.4-evolution-fix.diff
+# http://bugzilla.gnome.org/show_bug.cgi?id=334587
+Patch8: nst-module-unload-crasher.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -49,11 +57,15 @@
%patch2
%patch3
%patch4
+%patch5
+%patch6
+%patch7 -p1
+%patch8
cp -a %{S:1} src/
%build
-rename no nb po/no.*
-sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && mv configure.in.tmp configure.in
+rm po/no.*
+sed -i "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in
rm aclocal.m4
intltoolize -f
autoreconf -f -i
@@ -71,27 +83,22 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%prefix/%_lib/nautilus-sendto/plugins/*.*a
+rm $RPM_BUILD_ROOT%prefix/%_lib/nautilus/extensions-1.0/*.*a
+rm $RPM_BUILD_ROOT%prefix/%_lib/gaim/*.*a
%find_lang %{name}
-%post
-%run_ldconfig
-
-%postun
-%run_ldconfig
-
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS NEWS README COPYING
-%dir %{prefix}/%_lib/nautilus
-%dir %{prefix}/%_lib/nautilus/extensions-1.0
%{prefix}/%_lib/nautilus-sendto
-%{prefix}/%_lib/nautilus/extensions-1.0/*.la
+#%{prefix}/%_lib/nautilus/extensions-1.0/*.la
%{prefix}/%_lib/nautilus/extensions-1.0/*.so
-%{prefix}/%_lib/gaim/*.la
-%{prefix}/%_lib/gaim/*.so*
+#%{prefix}/%_lib/gaim/*.la
+%{prefix}/%_lib/gaim/*.so
%dir %{prefix}/share/nautilus-sendto
%dir %{prefix}/share/nautilus-sendto/glade
%{prefix}/share/nautilus-sendto/glade/*.glade
@@ -99,6 +106,12 @@
%{prefix}/bin/*
%changelog -n nautilus-sendto
+* Wed Apr 12 2006 - sbrabec@suse.cz
+- Simplified BuildRequires.
+- Applied patches from GNOME Bugzilla (no plugin crash, no family
+ name crash, plugin init fail crash - #165527).
+- Removed obsolete .la files and scriptlets.
+- Improved directory ownership.
* Thu Feb 02 2006 - sbrabec@suse.cz
- Fixed conflict in Swedish translation.
* Wed Feb 01 2006 - sbrabec@suse.cz
++++++ nautilus-sendto-0.4-evolution-fix.diff ++++++
diff -aur nautilus-sendto-0.4-orig/src/plugins/evolution.c nautilus-sendto-0.4/src/plugins/evolution.c
--- nautilus-sendto-0.4-orig/src/plugins/evolution.c 2005-07-31 14:34:52.000000000 -0700
+++ nautilus-sendto-0.4/src/plugins/evolution.c 2005-10-28 21:54:13.000000000 -0700
@@ -87,7 +87,7 @@
gchar *email = e->data;
hash_value = g_strdup_printf ("mailto:%s",email);
- if (strlen (family_name)==0){
+ if (family_name != NULL && strlen (family_name)==0){
/* Output : name <email> */
str = g_string_new("");
g_string_printf (str, "%s <%s>", given_name, email);
++++++ nautilus-sendto-0.4-noplugin.patch ++++++
Index: src/nautilus-sendto-command.c
===================================================================
RCS file: /cvs/gnome/nautilus-sendto/src/nautilus-sendto-command.c,v
retrieving revision 1.7
diff -u -p -r1.7 nautilus-sendto-command.c
--- src/nautilus-sendto-command.c 31 Jul 2005 21:39:02 -0000 1.7
+++ src/nautilus-sendto-command.c 9 Nov 2005 13:56:00 -0000
@@ -143,6 +143,9 @@ send_button_cb (GtkWidget *widget, gpoin
p = (NstPlugin *) g_list_nth_data (plugin_list, option);
w = (GtkWidget *) g_list_nth_data (ui->contact_widgets, option);
+ if (p == NULL)
+ return;
+
if (force_user_to_compress){
f = pack_files (ui);
if (f != NULL){
@@ -212,7 +215,8 @@ set_contact_widgets (NS_ui *ui){
gtk_widget_hide (GTK_WIDGET(w));
ui->contact_widgets = g_list_append (ui->contact_widgets, w);
}
- gtk_widget_show ((GtkWidget* ) ui->contact_widgets->data);
+ if (ui->contact_widgets)
+ gtk_widget_show ((GtkWidget* ) ui->contact_widgets->data);
}
void
++++++ nautilus-sendto-bluetooth-gerror.patch -> nautilus-sendto-bluetooth.patch ++++++
--- GNOME/nautilus-sendto/nautilus-sendto-bluetooth-gerror.patch 2005-12-09 20:47:09.000000000 +0100
+++ STABLE/nautilus-sendto/nautilus-sendto-bluetooth.patch 2006-04-12 16:13:16.000000000 +0200
@@ -1,17 +1,32 @@
--- src/plugins/bluetooth.c
+++ src/plugins/bluetooth.c
-@@ -44,10 +44,13 @@
- static gboolean
- init (NstPlugin *plugin)
- {
-+ GError *err = NULL;
+@@ -47,8 +47,13 @@
g_print ("Init bluetooth plugin\n");
btctl = gnomebt_controller_new ();
- if (btctl_controller_is_initialised (BTCTL_CONTROLLER (btctl)) == FALSE) {
-+ if (btctl_controller_is_initialised (BTCTL_CONTROLLER (btctl), &err) == FALSE) {
-+ if (err)
-+ g_error_free (err);
++ GError* e = NULL;
++
++ if (btctl_controller_is_initialised (BTCTL_CONTROLLER (btctl), &e) == FALSE) {
g_object_unref (btctl);
++ g_print ("Couldn't init bluetooth plugin: %s\n", e ? e->message : "No reason");
++ if (e)
++ g_error_free (e);
return FALSE;
}
+
+@@ -226,12 +231,13 @@
+ }
+ g_ptr_array_add (argv, NULL);
+
++#if 0
+ g_print ("launching command: ");
+ for (i = 0; i < argv->len - 1; i++) {
+ g_print ("%s ", (gchar *) g_ptr_array_index (argv, i));
+ }
+ g_print ("\n");
+-
++#endif
+ ret = g_spawn_async (NULL, (gchar **) argv->pdata,
+ NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err);
+ g_ptr_array_free (argv, TRUE);
++++++ nautilus-sendto-include.patch ++++++
--- src/nautilus-sendto-command.c
+++ src/nautilus-sendto-command.c
@@ -25,6 +25,7 @@
#include