Hello community, here is the log from the commit of package xarchiver for openSUSE:Factory checked in at Fri Jan 8 09:33:49 CET 2010. -------- --- xarchiver/xarchiver.changes 2008-11-14 11:44:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/xarchiver/xarchiver.changes 2010-01-08 09:11:22.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Jan 7 15:23:17 UTC 2010 - andrea@opensuse.org + +- backport fedora patches + - xarchiver-0.5.2-default-archive-format.patch + - xarchiver-0.5.2-no-donators-menu.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xarchiver-0.5.2-default-archive-format.patch xarchiver-0.5.2-no-donators-menu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xarchiver.spec ++++++ --- /var/tmp/diff_new_pack.0Xgqim/_old 2010-01-08 09:33:31.000000000 +0100 +++ /var/tmp/diff_new_pack.0Xgqim/_new 2010-01-08 09:33:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xarchiver (Version 0.5.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,10 +22,12 @@ BuildRequires: dbus-1-devel glib2-devel gtk2-devel pango-devel startup-notification update-desktop-files Summary: Xarchiver is frontend for archiver Version: 0.5.2 -Release: 1 -License: GPL v2 or later +Release: 2 +License: GPLv2+ Url: http://www.xfce.org/ Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-no-donators-menu.patch +Patch1: %{name}-%{version}-default-archive-format.patch Group: Productivity/Archiving/Compression BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,13 +43,17 @@ %prep %setup -q +# fix spurious executable permissions of some debug files +chmod -x src/mime.* +%patch0 -p2 +%patch1 -p1 %build %configure -make %{?jobs:-j%jobs} +%__make %{?jobs:-j%jobs} %install -make DESTDIR="$RPM_BUILD_ROOT" install +%makeinstall %find_lang %{name} install -D -m 644 ./icons/48x48/xarchiver.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/xarchiver.png %suse_update_desktop_file -i %{name} GTK Archiving Utility ++++++ xarchiver-0.5.2-default-archive-format.patch ++++++ --- xarchiver-0.5.2.orig/src/pref_dialog.c 2008-11-10 09:05:07.000000000 +0100 +++ xarchiver-0.5.2/src/pref_dialog.c 2009-03-22 23:50:47.000000000 +0100 @@ -102,7 +102,8 @@ archive_type = g_list_first (ArchiveType); while ( archive_type != NULL ) { - if (strcmp(archive_type->data, "tgz") == 0 || + if (strcmp(archive_type->data, "arj") == 0 || + strcmp(archive_type->data, "tgz") == 0 || strcmp(archive_type->data, "rpm") == 0 || (strcmp(archive_type->data, "rar") == 0 && unrar) ) goto next; ++++++ xarchiver-0.5.2-no-donators-menu.patch ++++++ --- xarchiver/trunk/src/interface.c 2009/03/19 18:03:52 29676 +++ xarchiver/trunk/src/interface.c 2009/03/19 20:48:19 29677 @@ -310,22 +310,14 @@ gtk_widget_show (tmp_image); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1),tmp_image); + donate = gtk_image_menu_item_new_with_mnemonic (_("_Donate")); + gtk_widget_show (donate); + gtk_container_add (GTK_CONTAINER (menuitem4_menu),donate); + about1 = gtk_image_menu_item_new_from_stock ("gtk-about",accel_group); gtk_widget_show (about1); gtk_container_add (GTK_CONTAINER (menuitem4_menu),about1); - thanks_to = gtk_image_menu_item_new_with_mnemonic (_("_Thanks to")); - gtk_widget_show (thanks_to); - gtk_container_add (GTK_CONTAINER (menuitem4_menu),thanks_to); - - thanks_to_submenu = gtk_menu_new(); - gtk_widget_show (thanks_to_submenu); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (thanks_to),thanks_to_submenu); - - donators = gtk_image_menu_item_new_with_mnemonic ("Your name and website here"); - gtk_widget_show (donators); - gtk_container_add (GTK_CONTAINER (thanks_to_submenu),donators); - /* Create the toolbar */ toolbar1 = gtk_toolbar_new (); gtk_widget_show (toolbar1); @@ -543,7 +535,7 @@ g_signal_connect ((gpointer) multi_extract_menu,"activate",G_CALLBACK (xa_show_multi_extract_dialog),NULL); g_signal_connect ((gpointer) help1,"activate",G_CALLBACK (xa_show_help),NULL); g_signal_connect ((gpointer) about1,"activate",G_CALLBACK (xa_about),NULL); - g_signal_connect ((gpointer) donators,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL); + g_signal_connect ((gpointer) donate,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL); g_signal_connect ((gpointer) New_button, "clicked",G_CALLBACK (xa_new_archive),NULL); g_signal_connect ((gpointer) Open_button, "clicked",G_CALLBACK (xa_open_archive),NULL); --- xarchiver/trunk/src/interface.h 2008/11/04 10:06:17 28603 +++ xarchiver/trunk/src/interface.h 2009/03/19 20:48:19 29677 @@ -48,8 +48,8 @@ *name_label, *type_label, *compression_data, *encrypted_data, *encrypted_label,*number_of_files_data, *content_data, *comment_data, *size_data, *modified_data, *path_data, *type_data, *name_data, *separatormenuitem1, *separatormenuitem2, *separatormenuitem3, *separatormenuitem4, *separatormenuitem5, *separatormenuitem6, *quit1, *close1, *check_menu, *properties, *menuitem2, *menuitem2_menu, *addfile, *extract_menu, *delete_menu, *comment_menu, *multi_extract_menu,*view_shell_output1, -*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *thanks_to,*thanks_to_submenu,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu, -*about1, *help1, *donators,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button, +*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *donate,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu, +*about1, *help1,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button, *up_button,*separatortoolitem1,*separatortoolitem2,*separatortoolitem3,*AddFile_button,*Extract_button,*Stop_button,*toolitem1,*location_label, *location_entry,*hpaned1,*archive_dir_treeview,*scrolledwindow2,*ddelete,*rename_menu,*rrename,*cut,*copy,*paste,*view,*open_popupmenu; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org