rpm/file-roller
SHA256
1
0
Fork 0
forked from pool/file-roller
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=30

Browse Source
This commit is contained in:
OBS User unknown
2008-11-05 23:20:51 +00:00
committed by Git OBS Bridge
parent b650d36ab7
commit b6a0375e2b
3 changed files with 12 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
file-roller-2.20.0-correct-help-uri.patch
View File

@@ -1,47 +0,0 @@
diff -upr file-roller-2.20.0-pre/src/gtk-utils.c file-roller-2.20.0-work/src/gtk-utils.c
--- file-roller-2.20.0-pre/src/gtk-utils.c 2007-09-17 14:40:06.000000000 -0500
+++ file-roller-2.20.0-work/src/gtk-utils.c 2007-09-25 21:20:00.000000000 -0500
@@ -798,39 +798,19 @@ show_help_dialog (GtkWindow *parent,
{
GError *err = NULL;
char *command;
- const char *lang;
- char *uri = NULL;
- int i;
GdkScreen *gscreen;
- const char * const * langs = g_get_language_names ();
-
- for (i = 0; langs[i]; i++) {
- lang = langs[i];
- if (strchr (lang, '.')) {
- continue;
- }
-
- uri = g_build_filename(FR_DATADIR,
- "/gnome/help/file-roller/",
- lang,
- "/file-roller.xml",
- NULL);
-
- if (g_file_test (uri, G_FILE_TEST_EXISTS)) {
- break;
- }
- }
-
if (link_id) {
- command = g_strconcat ("gnome-open ghelp://", uri, "?", link_id, NULL);
+ command = g_strconcat ("gnome-open ghelp://file-roller#", link_id, NULL);
} else {
- command = g_strconcat ("gnome-open ghelp://", uri, NULL);
+ command = g_strdup ("gnome-open ghelp://file-roller");
}
gscreen = gdk_screen_get_default();
gdk_spawn_command_line_on_screen (gscreen, command, &err);
+ g_free (command);
+
if (err != NULL) {
GtkWidget *dialog;

6
file-roller.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 5 15:00:09 EST 2008 - jpr@novell.com
- Obsolete file-roller-2.20.0-correct-help-uri.patch, obsoleted
upstream (was bnc326492 bgo480442)
-------------------------------------------------------------------
Tue Oct 21 21:15:53 EST 2008 - mboman@suse.de

11
file-roller.spec
View File

@@ -27,14 +27,12 @@ BuildRequires: update-desktop-files
License: GPL v2 or later
Group: Productivity/Archiving/Compression
Version: 2.24.1
Release: 1
Release: 2
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
# PATCH-NEEDS-REBASE file-roller-2.20.0-correct-help-uri.patch bnc326492 bgo480442 hpj@novell.com -- was PATCH-FIX-UPSTREAM
Patch5: file-roller-2.20.0-correct-help-uri.patch
Url: http://fileroller.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
DocDir: %{_defaultdocdir}
@@ -133,6 +131,9 @@ fi
%files lang -f %name.lang
%changelog
* 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
- Update to version 2.24.1:
+ Bugs fixed: bgo#556623, bgo#556619, bgo#556571, bgo#555282
@@ -260,7 +261,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.
* Thu Dec 20 2007 jpr@suse.de
* Wed Dec 19 2007 jpr@suse.de
-Update to 2.20.2
* Updated translations
* Fixed crash after cancelling an archive creation from the
@@ -485,7 +486,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.
* Tue Aug 17 2004 shprasad@suse.de
* Mon Aug 16 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)