From 7c33afef7cc0d3f390bce6a331eeb13299d84e6782dfd459549e35053e59bba5 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 21 Dec 2007 09:23:03 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=15 --- file-roller-2.20.0.tar.bz2 | 3 --- file-roller-2.20.2.tar.bz2 | 3 +++ file-roller.changes | 12 +++++++++++ file-roller.spec | 30 +++++++++++++++++--------- fr_59941.diff | 43 -------------------------------------- 5 files changed, 35 insertions(+), 56 deletions(-) delete mode 100644 file-roller-2.20.0.tar.bz2 create mode 100644 file-roller-2.20.2.tar.bz2 delete mode 100644 fr_59941.diff diff --git a/file-roller-2.20.0.tar.bz2 b/file-roller-2.20.0.tar.bz2 deleted file mode 100644 index be0d1da..0000000 --- a/file-roller-2.20.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:032c8d3183078f60321fd764113ac8729e42e1be1cc02cb47191855be97f3bdb -size 1223266 diff --git a/file-roller-2.20.2.tar.bz2 b/file-roller-2.20.2.tar.bz2 new file mode 100644 index 0000000..4cf8abe --- /dev/null +++ b/file-roller-2.20.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35b906834acfc3b36760c1f76c31215a5ac371cb883ca27759cab2306370b107 +size 1227085 diff --git a/file-roller.changes b/file-roller.changes index e2c6a71..b7eb8bc 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -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 diff --git a/file-roller.spec b/file-roller.spec index e3c6eb9..777a196 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -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. # This file and all modifications and additions to the pristine @@ -11,19 +11,23 @@ # norootforbuild 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 Group: System/GUI/GNOME -Version: 2.20.0 -Release: 13 +Version: 2.20.2 +Release: 1 Requires: %{name}-lang = %{version} Summary: An Archive Manager for GNOME 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 -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 +#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 +#PATCH-FIX-UPSTREAM abuild.patch bgo504597 maw@novell.com 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 Url: http://fileroller.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,22 +74,18 @@ Authors: %lang_package %prep %setup -q -gnome-patch-translation-prepare %patch -p1 -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -gnome-patch-translation-update %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -autoreconf -i -f %configure\ --disable-schemas-install\ --disable-scrollkeeper -make %{?jobs:-j%jobs} +%__make %{?jobs:-j%jobs} %install %makeinstall @@ -129,7 +129,17 @@ fi %{_libdir}/nautilus/extensions-*/*.so %files lang -f %name.lang + %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 - Removed bogus dependency on mDNSResponder. * Wed Sep 26 2007 - hpj@suse.de diff --git a/fr_59941.diff b/fr_59941.diff deleted file mode 100644 index f750b26..0000000 --- a/fr_59941.diff +++ /dev/null @@ -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 -+2004-06-16 Subrahmanyam Madduri -+ -+ * 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 = - " " - " " - " " -+" " - " " - " " - " "