rpms/gnome-libs/devel gnome-libs-1.4.2-xdg-open.patch, NONE, 1.1 gnome-libs.spec, 1.6, 1.7
Paul Howarth (pghmcfc)
fedora-extras-commits at redhat.com
Fri Oct 26 09:10:33 UTC 2007
Author: pghmcfc
Update of /cvs/pkgs/rpms/gnome-libs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28357
Modified Files:
gnome-libs.spec
Added Files:
gnome-libs-1.4.2-xdg-open.patch
Log Message:
Use xdg-open in preference to htmlview for Fedora 7 onwards
gnome-libs-1.4.2-xdg-open.patch:
--- NEW FILE gnome-libs-1.4.2-xdg-open.patch ---
--- gnome-libs-1.4.2/libgnome/gnome-url.c 2007-10-26 09:37:05.000000000 +0100
+++ gnome-libs-1.4.2/libgnome/gnome-url.c 2007-10-26 09:43:37.000000000 +0100
@@ -31,7 +31,7 @@
static gchar *uri_get_file_uri_from_ghelp_uri (const gchar *path);
-#define DEFAULT_HANDLER "htmlview \"%s\""
+#define DEFAULT_HANDLER "xdg-open \"%s\""
static gchar *
gnome_url_default_handler (const char *protocol)
@@ -74,7 +74,7 @@
strcmp (protocol, "man") == 0)) {
return app;
} else {
- /* always force use of htmlview */
+ /* always force use of xdg-open */
default_handler = DEFAULT_HANDLER;
}
} else {
@@ -84,7 +84,7 @@
strcmp (protocol, "man") == 0)) {
default_handler = str;
} else {
- /* force htmlview */
+ /* force xdg-open */
default_handler = DEFAULT_HANDLER;
}
}
@@ -141,14 +141,14 @@
/* We no longer have any app (other than Galeon)
* that can handle both ghelp: URI's and GNOME 1
* help files, so do a hardcoded translation
- * and then run htmlview.
+ * and then run xdg-open.
*/
if (strstr (url, "galeon") != NULL) {
/* But always use Galeon for Galeon */
template = "galeon \"%s\"";
} else {
url = tmp_url = uri_get_file_uri_from_ghelp_uri (pos + 1);
- template = "htmlview \"%s\"";
+ template = "xdg-open \"%s\"";
}
} else {
path = g_strconcat ("/Gnome/URL Handlers/", protocol, "-show", NULL);
Index: gnome-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-libs.spec 25 Oct 2007 12:47:11 -0000 1.6
+++ gnome-libs.spec 26 Oct 2007 09:09:59 -0000 1.7
@@ -18,7 +18,11 @@
Source3: http://downloads.sleepycat.com/db.1.85.tar.gz
Source4: utf8-ta.po
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?fedora} >= 7
+Requires: xdg-utils
+%else
Requires: htmlview
+%endif
# Make sure utmp group exists at install time (#24171)
Requires: utempter
@@ -67,6 +71,7 @@
Patch101: gnome-libs-1.4.2-dateedit-fix1.patch
Patch102: gnome-libs-1.4.2-multiarch.patch
Patch103: gnome-libs-1.4.2-umode_t.patch
+Patch104: gnome-libs-1.4.2-xdg-open.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
@@ -132,6 +137,9 @@
%patch101 -p1 -b .dateedit-fix1
%patch102 -p1 -b .multiarch
%patch103 -p1 -b .umode_t
+%if 0%{?fedora} >= 7
+%patch104 -p1 -b .xdg-open
+%endif
/usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
%{__mv} -f ChangeLog.utf-8 ChangeLog
@@ -286,7 +294,7 @@
%{_libdir}/libgnomeui.so
%changelog
-* Thu Oct 25 2007 Paul Howarth <paul at city-fan.org> 1:1.4.2-6
+* Fri Oct 26 2007 Paul Howarth <paul at city-fan.org> 1:1.4.2-6
- Clarify licensing (db 1.85 is BSD with advertising, and many objects link
to it)
- Don't manually install files in %%install that aren't going to be packaged
@@ -296,6 +304,7 @@
%%{_bindir}/libart-config, and
%%{_includedir}/gnome-1.0/libart_lgpl/art_config.h (#341321)
- Add patch to help configure find umode_t and hence avoid ppc64 build failure
+- Use xdg-open in preference to htmlview for Fedora 7 onwards
* Fri Mar 9 2007 Paul Howarth <paul at city-fan.org> 1:1.4.2-5
- Fix GnomeDateEdit time format regression (#230186)
More information about the fedora-extras-commits
mailing list