OBS User unknown 2007-12-21 09:23:03 +00:00 committed by Git OBS Bridge
parent e3d54af318
commit 7c33afef7c
5 changed files with 35 additions and 56 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:032c8d3183078f60321fd764113ac8729e42e1be1cc02cb47191855be97f3bdb
size 1223266

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:35b906834acfc3b36760c1f76c31215a5ac371cb883ca27759cab2306370b107
size 1227085

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Dec 20 06:09:37 CEST 2007 - jpr@suse.de
-Update to 2.20.2
* Updated translations
* Fixed crash after cancelling an archive creation from the
Nautilus context menu. (bgo #482203)
- Remove fr_59941.diff, it served no real purpose, added translations
and was rejected upstream in bgo144800
- Remove bogus BuildRequires: gnutls-devel, gnome-patch-translation,
libgnomeprintui-devel, libwnck-devel
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 11 16:39:37 CEST 2007 - sbrabec@suse.cz Thu Oct 11 16:39:37 CEST 2007 - sbrabec@suse.cz

View File

@ -1,5 +1,5 @@
# #
# spec file for package file-roller (Version 2.20.0) # spec file for package file-roller (Version 2.20.2)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -11,19 +11,23 @@
# norootforbuild # norootforbuild
Name: file-roller Name: file-roller
BuildRequires: docbook-xsl-stylesheets fdupes gnome-doc-utils-devel gnome-patch-translation gnutls-devel intltool libglade2-devel libgnomeprintui-devel libwnck-devel nautilus-devel perl-XML-Parser scrollkeeper update-desktop-files BuildRequires: docbook-xsl-stylesheets fdupes gconf2-devel glib2-devel gnome-doc-utils-devel gnome-vfs2-devel gtk2-devel intltool libglade2-devel libgnome-devel libgnomeui-devel nautilus-devel perl-XML-Parser scrollkeeper update-desktop-files
License: GPL v2 or later License: GPL v2 or later
Group: System/GUI/GNOME Group: System/GUI/GNOME
Version: 2.20.0 Version: 2.20.2
Release: 13 Release: 1
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
Summary: An Archive Manager for GNOME Summary: An Archive Manager for GNOME
Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2 Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2
#PATCH-FIX-SUSE file-roller-ximian-defaults.patch -- Upstream thinks this is obsolete, needs confirmation
Patch0: file-roller-ximian-defaults.patch Patch0: file-roller-ximian-defaults.patch
Patch1: fr_59941.diff #PATCH-FIX-UPSTREAM file-roller-2.12.2-no-cmdline-overflow.patch bnc169646 bgo159240 hpj@novell.com -- Upstream thinks this is obsolete, needs confirmation
Patch2: file-roller-2.12.2-no-cmdline-overflow.patch Patch2: file-roller-2.12.2-no-cmdline-overflow.patch
#PATCH-FIX-UPSTREAM bug-187126_file-roller-batch-extract-all.patch bnc187126 bgo342043 jberkman@novell.com -- Upstream says this is committed but its not
Patch3: bug-187126_file-roller-batch-extract-all.patch Patch3: bug-187126_file-roller-batch-extract-all.patch
#PATCH-FIX-UPSTREAM abuild.patch bgo504597 maw@novell.com
Patch4: abuild.patch Patch4: abuild.patch
#PATCH-FIX-UPSTREAM file-roller-2.20.0-correct-help-uri.patch bnc326492 bgo480442 hpj@novell.com
Patch5: file-roller-2.20.0-correct-help-uri.patch Patch5: file-roller-2.20.0-correct-help-uri.patch
Url: http://fileroller.sourceforge.net Url: http://fileroller.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -70,22 +74,18 @@ Authors:
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
gnome-patch-translation-prepare
%patch -p1 %patch -p1
%patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
gnome-patch-translation-update
%build %build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
autoreconf -i -f
%configure\ %configure\
--disable-schemas-install\ --disable-schemas-install\
--disable-scrollkeeper --disable-scrollkeeper
make %{?jobs:-j%jobs} %__make %{?jobs:-j%jobs}
%install %install
%makeinstall %makeinstall
@ -129,7 +129,17 @@ fi
%{_libdir}/nautilus/extensions-*/*.so %{_libdir}/nautilus/extensions-*/*.so
%files lang -f %name.lang %files lang -f %name.lang
%changelog %changelog
* Thu Dec 20 2007 - jpr@suse.de
-Update to 2.20.2
* Updated translations
* Fixed crash after cancelling an archive creation from the
Nautilus context menu. (bgo #482203)
- Remove fr_59941.diff, it served no real purpose, added translations
and was rejected upstream in bgo144800
- Remove bogus BuildRequires: gnutls-devel, gnome-patch-translation,
libgnomeprintui-devel, libwnck-devel
* Thu Oct 11 2007 - sbrabec@suse.cz * Thu Oct 11 2007 - sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder. - Removed bogus dependency on mDNSResponder.
* Wed Sep 26 2007 - hpj@suse.de * Wed Sep 26 2007 - hpj@suse.de

View File

@ -1,43 +0,0 @@
Index: file-roller-2.19.4/ChangeLog
===================================================================
--- file-roller-2.19.4.orig/ChangeLog
+++ file-roller-2.19.4/ChangeLog
@@ -809,6 +809,13 @@
* configure.in: changed version to 2.19.0
2007-03-12 Paolo Bacchilega <paobac@cvs.gnome.org>
+2004-06-16 Subrahmanyam Madduri <smadduri@novell.com>
+
+ * src/ui.h : (action_entries): Added any entry for the "Delete File"
+ in the toolbar. And connected the clckevent of the button to
+ activate_action_delete in actions.c
+ Fixes bug #144800
+
[ File Roller 2.18.0 released ]
Index: file-roller-2.19.4/src/ui.h
===================================================================
--- file-roller-2.19.4.orig/src/ui.h
+++ file-roller-2.19.4/src/ui.h
@@ -108,7 +108,10 @@ static GtkActionEntry action_entries[] =
NULL, NULL,
N_("Delete the selection from the archive"),
G_CALLBACK (activate_action_delete_folder_from_sidebar) },
-
+ { "DeleteFile_Toolbar", GTK_STOCK_REMOVE,
+ N_("Delete"), NULL,
+ N_("Delete file from the archive"),
+ G_CALLBACK (activate_action_delete) },
{ "DeselectAll", NULL,
N_("Dese_lect All"), NULL,
N_("Deselect all files"),
@@ -313,6 +316,7 @@ static const gchar *ui_info =
" <toolbar name='ToolBar'>"
" <toolitem action='New'/>"
" <toolitem action='Extract_Toolbar'/>"
+" <toolitem action='DeleteFile_Toolbar'/>"
" <separator/>"
" <toolitem action='AddFiles_Toolbar'/>"
" <toolitem action='AddFolder_Toolbar'/>"