From 90b9fcd61ac84eccc991a2ebf8a4fa9756f6d38dad28604cc2e9dac31c03d53f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 6 Feb 2009 21:54:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=31 --- ...187126_file-roller-batch-extract-all.patch | 53 ------------- file-roller-2.24.1.tar.bz2 | 3 - file-roller-2.25.2.tar.bz2 | 3 + file-roller.changes | 38 ++++++++++ file-roller.spec | 74 ++++++++++++------- 5 files changed, 89 insertions(+), 82 deletions(-) delete mode 100644 bug-187126_file-roller-batch-extract-all.patch delete mode 100644 file-roller-2.24.1.tar.bz2 create mode 100644 file-roller-2.25.2.tar.bz2 diff --git a/bug-187126_file-roller-batch-extract-all.patch b/bug-187126_file-roller-batch-extract-all.patch deleted file mode 100644 index f582efe..0000000 --- a/bug-187126_file-roller-batch-extract-all.patch +++ /dev/null @@ -1,53 +0,0 @@ -Novell bug: https://bugzilla.novell.com/show_bug.cgi?id=187126 -Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=342043 -Original bug: https://launchpad.net/distros/ubuntu/+source/file-roller/+bug/40899 - -2006-12-11 jacob berkman - - * src/window.h (FRWindow): add batch_extracting_all boolean - - * src/window.c (window_fake_load): load if batch extracting - all and archive doesn't directly support extracting all - - * src/window.c (window_new): initialise batch_extracting_all - - * src/window.c (window_archive__open_extract): tell - window_fake_load that we are batch extracting all - -Index: file-roller-2.23.5/src/fr-window.c -=================================================================== ---- file-roller-2.23.5.orig/src/fr-window.c -+++ file-roller-2.23.5/src/fr-window.c -@@ -395,6 +395,7 @@ struct _FrWindowPrivateData { - gboolean extract_interact_use_default_dir; - gboolean update_dropped_files; - gboolean batch_adding_one_file; -+ gboolean batch_extracting_all; - - GtkWindow *load_error_parent_window; - gboolean showing_error_dialog; -@@ -4987,7 +4988,7 @@ fr_window_fake_load (FrArchive *archive, - return (window->priv->batch_mode - && ! (add_after_opening && window->priv->update_dropped_files && ! archive->command->propAddCanUpdate) - && ! (add_after_opening && ! window->priv->update_dropped_files && ! archive->command->propAddCanReplace) -- && ! (extract_after_opening && !archive->command->propCanExtractAll)); -+ && ! (window->priv->batch_extracting_all && !(extract_after_opening && !archive->command->propCanExtractAll))); - #endif - } - -@@ -5413,6 +5414,7 @@ fr_window_construct (FrWindow *window) - window->priv->stoppable = TRUE; - - window->priv->batch_adding_one_file = FALSE; -+ window->priv->batch_extracting_all = FALSE; - - window->priv->path_clicked = NULL; - -@@ -8519,6 +8521,7 @@ fr_window_new_batch (FrWindow *window) - { - fr_window_free_batch_data (window); - window->priv->non_interactive = TRUE; -+ window->priv->batch_extracting_all = TRUE; - } - - diff --git a/file-roller-2.24.1.tar.bz2 b/file-roller-2.24.1.tar.bz2 deleted file mode 100644 index c612504..0000000 --- a/file-roller-2.24.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d8488fb4b7a5a0ac4430fdd3cbdfefaa73535c972cc8002c7c87e0728e6e531 -size 1481447 diff --git a/file-roller-2.25.2.tar.bz2 b/file-roller-2.25.2.tar.bz2 new file mode 100644 index 0000000..5f70704 --- /dev/null +++ b/file-roller-2.25.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8f92ad0053c8d632cfaedefda644d6f1990c8e14f4adc4e66d33962c1f026cc +size 1508047 diff --git a/file-roller.changes b/file-roller.changes index 75000ed..ef8b78b 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Thu Jan 29 12:56:01 CET 2009 - vuntz@novell.com + +- Own /usr/share/gnome/help to not depend on libgnome. + +------------------------------------------------------------------- +Wed Jan 28 02:04:22 WET 2009 - lmedinas@gmail.com + +- Update to version 2.25.2: + + Fixed bugs: bgo #567554, bgo #566591, bgo #560647, bgo #563208, +bgo 564029, bgo #565879, bgo #567901, bgo #568260, bgo #566683 + + Translation updates + +------------------------------------------------------------------- +Fri Jan 23 05:24:36 CET 2009 - vuntz@novell.com + +- Drop bug-187126_file-roller-batch-extract-all.patch: it was fixed + another upstream a long time ago. +- Remove useless BuildRequires. + +------------------------------------------------------------------- +Tue Jan 6 09:11:25 EST 2009 - mboman@suse.de + +- Update to version 2.25.1: + + bgo#564805: Drop libgnome/ui dependency + + bgo#561535: Unable to create archive with OpenOffice document using + nautilus integration + + bgo#559481: Can't open/view file directly from File Roller if there + is a bracket in the directory/file name + + Translation updates + +------------------------------------------------------------------- +Sun Dec 14 03:24:33 WET 2008 - lmedinas@gmail.com + +- Update to version 2.24.2: + + Fix gconf dependecies + + Updated Translations + ------------------------------------------------------------------- Wed Nov 5 15:00:09 EST 2008 - jpr@novell.com diff --git a/file-roller.spec b/file-roller.spec index 333c1eb..09b41a1 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,7 +1,7 @@ # -# spec file for package file-roller (Version 2.24.1) +# spec file for package file-roller (Version 2.25.2) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -19,20 +19,18 @@ Name: file-roller -BuildRequires: docbook-xsl-stylesheets fdupes gconf2-devel glib2-devel -BuildRequires: gnome-doc-utils-devel gnome-vfs2-devel gtk2-devel intltool -BuildRequires: libglade2-devel libgnome-devel libgnomeui-devel -BuildRequires: nautilus-devel perl-XML-Parser scrollkeeper +BuildRequires: fdupes gconf2-devel glib2-devel +BuildRequires: gnome-doc-utils-devel gtk2-devel intltool +BuildRequires: libglade2-devel +BuildRequires: nautilus-devel scrollkeeper BuildRequires: update-desktop-files License: GPL v2 or later Group: Productivity/Archiving/Compression -Version: 2.24.1 -Release: 2 +Version: 2.25.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-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 Url: http://fileroller.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build DocDir: %{_defaultdocdir} @@ -78,8 +76,6 @@ Authors: %lang_package %prep %setup -q -%patch3 -p1 -# %patch5 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -93,7 +89,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving %find_lang %{name} %find_gconf_schemas -### cat %{name}.lang %{name}.schemas_list >%{name}.lst cat %{name}.schemas_list >%{name}.lst rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a %fdupes $RPM_BUILD_ROOT @@ -129,16 +124,43 @@ fi %{_libdir}/nautilus/extensions-2.0/*.so %files lang -f %name.lang +# Temporary workaround to not depend on libgnome: own the directories +%defattr (-, root, root) +%dir %{_datadir}/gnome +%dir %{_datadir}/gnome/help %changelog +* Thu Jan 29 2009 vuntz@novell.com +- Own /usr/share/gnome/help to not depend on libgnome. +* Wed Jan 28 2009 lmedinas@gmail.com +- Update to version 2.25.2: + + Fixed bugs: bgo #567554, bgo #566591, bgo #560647, bgo #563208, + bgo 564029, bgo #565879, bgo #567901, bgo #568260, bgo #566683 + + Translation updates +* Fri Jan 23 2009 vuntz@novell.com +- Drop bug-187126_file-roller-batch-extract-all.patch: it was fixed + another upstream a long time ago. +- Remove useless BuildRequires. +* Tue Jan 06 2009 mboman@suse.de +- Update to version 2.25.1: + + bgo#564805: Drop libgnome/ui dependency + + bgo#561535: Unable to create archive with OpenOffice document using + nautilus integration + + bgo#559481: Can't open/view file directly from File Roller if there + is a bracket in the directory/file name + + Translation updates +* Sun Dec 14 2008 lmedinas@gmail.com +- Update to version 2.24.2: + + Fix gconf dependecies + + Updated Translations * Wed Nov 05 2008 jpr@novell.com - Obsolete file-roller-2.20.0-correct-help-uri.patch, obsoleted upstream (was bnc326492 bgo480442) -* Tue Oct 21 2008 mboman@suse.de +* Wed Oct 22 2008 mboman@suse.de - Update to version 2.24.1: + Bugs fixed: bgo#556623, bgo#556619, bgo#556571, bgo#555282 + Translation updates -* Tue Sep 30 2008 mboman@suse.de +* Wed Oct 01 2008 mboman@suse.de - Update to version 2.24.0: + bgo#546799: file-roller crashed with SIGSEGV in g_str_hash() + bgo#552031: Add archiving and compression to desktop categories. @@ -187,7 +209,7 @@ fi bgo#545188, bgo#545168, bgo#545161, bgo#544613, bgo#544296, bgo#544184, and bgo#544182 + Updated translations. -* Fri Jun 20 2008 maw@suse.de +* Sat Jun 21 2008 maw@suse.de - Update to version 2.23.3: + Show an alert dialog when the 'save as' operation is completed, and allow the user the open the newly created archive @@ -238,7 +260,7 @@ fi + Fixed a performace issue when extracting a big archive with a drag and drop operation + Updated translations. -* Thu Mar 13 2008 maw@suse.de +* Fri Mar 14 2008 maw@suse.de - Update to version 2.22.0: + Bugs fixed: bgo#518680 and bgo#504155 + Updated translations. @@ -261,7 +283,7 @@ fi + Bugs fixed: bgo#487012, bgo#487079, bgo#499958, bgo#499558, bgo#458399, bgo#475166, bgo#505987, bgo#487012, bgo#490891, bgo#504597, bgo#303213, and bgo#509933. -* Wed Dec 19 2007 jpr@suse.de +* Thu Dec 20 2007 jpr@suse.de -Update to 2.20.2 * Updated translations * Fixed crash after cancelling an archive creation from the @@ -272,10 +294,10 @@ fi libgnomeprintui-devel, libwnck-devel * Thu Oct 11 2007 sbrabec@suse.cz - Removed bogus dependency on mDNSResponder. -* Tue Sep 25 2007 hpj@suse.de +* Wed Sep 26 2007 hpj@suse.de - Add file-roller-2.20.0-correct-help-uri.patch, which fixes a broken help path. -* Tue Sep 18 2007 mauro@suse.de +* Wed Sep 19 2007 mauro@suse.de - Update to version 2.20.0 * Fixed bug #473158 – ask-password.glade is missing * Fixes bug #463968 – file-roller crashed with SIGSEGV in @@ -331,19 +353,19 @@ fi * Mon Jan 15 2007 sbrabec@suse.cz - Prefix changed to /usr. - Spec file cleanup. -* Mon Dec 18 2006 btimothy@suse.de +* Tue Dec 19 2006 btimothy@suse.de - Fix for BNC #223562 to allow self-extracting executables made in WinZIP to extract/open in file-roller. * Tue Dec 12 2006 jhargadon@suse.de - applied a patch to fix crashing when an iso image is right-clicked (#187126) -* Thu Oct 12 2006 danw@suse.de +* Fri Oct 13 2006 danw@suse.de - Remove dead patch - Update for gnome-doc-utils-devel * Tue Oct 03 2006 jhargadon@suse.de - update to version 2.16.1 - translation updates -* Wed Sep 13 2006 jhargadon@suse.de +* Thu Sep 14 2006 jhargadon@suse.de - update to version 2.16.0 - translation updates * Wed Aug 30 2006 jhargadon@suse.de @@ -460,7 +482,7 @@ fi - Update to version 2.11.91 * Tue Aug 09 2005 gekker@suse.de - Fix requirements (98219) -* Mon Aug 01 2005 gekker@suse.de +* Tue Aug 02 2005 gekker@suse.de - Update to version 2.11.90 * Thu Jul 21 2005 gekker@suse.de - Update to version 2.11.2 @@ -486,7 +508,7 @@ fi Avoids crashing if file-roller is closed while viewing files. * Wed Aug 25 2004 clahey@suse.de - Cache file-roller help and show file-roller in khelpcenter. -* Mon Aug 16 2004 shprasad@suse.de +* Tue Aug 17 2004 shprasad@suse.de - Fixes bug #60958 (Fix given by smadduri@novell.com) Avoids Crashing while DND of Desktop Icons (Home). - Fixes bug #62359 (Fix given by smadduri@novell.com) @@ -542,7 +564,7 @@ fi - filelist review - added openssl and alsa-devel to neededforbuild - install and register schemas file -* Wed Jan 15 2003 ro@suse.de +* Thu Jan 16 2003 ro@suse.de - use gtk2-devel-packages and libjpeg in neededforbuild * Tue Jan 14 2003 ro@suse.de - added expat to neededforbuild