rpms/xarchiver/F-11 xarchiver-0.5.2-default-archive-format.patch, NONE, 1.1 xarchiver-0.5.2-no-donators-menu.patch, NONE, 1.1 xarchiver.spec, 1.15, 1.16
Christoph Wickert
cwickert at fedoraproject.org
Fri Apr 17 19:32:28 UTC 2009
- Previous message: rpms/griffith/devel griffith.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/mingw32-libglade2/F-11 libglade-2.0.1-nowarning.patch, NONE, 1.1 libglade-secondary.patch, NONE, 1.1 mingw32-libglade2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cwickert
Update of /cvs/pkgs/rpms/xarchiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15834
Modified Files:
xarchiver.spec
Added Files:
xarchiver-0.5.2-default-archive-format.patch
xarchiver-0.5.2-no-donators-menu.patch
Log Message:
* Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-4
- Gui fixes (#491115)
xarchiver-0.5.2-default-archive-format.patch:
--- NEW FILE 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:
--- NEW FILE 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;
Index: xarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xarchiver/F-11/xarchiver.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xarchiver.spec 26 Feb 2009 07:41:08 -0000 1.15
+++ xarchiver.spec 17 Apr 2009 19:31:58 -0000 1.16
@@ -1,12 +1,14 @@
Name: xarchiver
Version: 0.5.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Archive manager for Xfce
Group: Applications/Archiving
License: GPLv2+
URL: http://xarchiver.xfce.org/
Source0: http://downloads.sourceforge.net/xarchiver/xarchiver-%{version}.tar.bz2
+Patch0: xarchiver-0.5.2-no-donators-menu.patch
+Patch1: xarchiver-0.5.2-default-archive-format.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, libxml2-devel, gettext, desktop-file-utils
@@ -24,7 +26,8 @@
%setup -q
# fix spurious executable permissions of some debug files
chmod -x src/mime.*
-
+%patch0 -p2 -b .donate
+%patch1 -p1 -b .default
%build
%configure
@@ -87,6 +90,9 @@
%changelog
+* Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-4
+- Gui fixes (#491115)
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
- Previous message: rpms/griffith/devel griffith.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/mingw32-libglade2/F-11 libglade-2.0.1-nowarning.patch, NONE, 1.1 libglade-secondary.patch, NONE, 1.1 mingw32-libglade2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list