diff --git a/epiphany-2.26.0.tar.bz2 b/epiphany-2.26.0.tar.bz2 deleted file mode 100644 index b0f1758..0000000 --- a/epiphany-2.26.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0d801b967c94828c8389e36588be1db9a077830019169f6f9730708ae1d59e5 -size 5626038 diff --git a/epiphany-2.27.5.tar.bz2 b/epiphany-2.27.5.tar.bz2 new file mode 100644 index 0000000..99dee87 --- /dev/null +++ b/epiphany-2.27.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7025cd5b318f6d16f98b3538fde5d2951bb9a61b904a40b3e6d9e2266ff13ea9 +size 5666889 diff --git a/epiphany-bgo300190-default-bookmarks.patch b/epiphany-bgo300190-default-bookmarks.patch index d1e6b2d..acfe2eb 100644 --- a/epiphany-bgo300190-default-bookmarks.patch +++ b/epiphany-bgo300190-default-bookmarks.patch @@ -1,228 +1,6 @@ -Index: src/bookmarks/ephy-bookmarks-import.c -=================================================================== ---- src/bookmarks/ephy-bookmarks-import.c (révision 8368) -+++ src/bookmarks/ephy-bookmarks-import.c (copie de travail) -@@ -812,49 +812,65 @@ ephy_bookmarks_import_xbel (EphyBookmark - return ret >= 0 ? TRUE : FALSE; - } - --#define OLD_RDF_TEMPORARY_HACK -- - static void --parse_rdf_subjects (xmlNodePtr node, -- GList **subjects) -+parse_rdf_lang_tag (xmlNode *child, -+ xmlChar **value, -+ int *best_match) - { -- xmlChar *subject; -- --#ifdef OLD_RDF_TEMPORARY_HACK -- xmlNode *child; -+ const char * const *locales; -+ char *this_language; -+ xmlChar *lang; -+ xmlChar *content; -+ int i; -+ -+ if (*best_match == 0) -+ /* there's no way we can do better */ -+ return; -+ -+ locales = g_get_language_names (); -+ -+ content = xmlNodeGetContent (child); -+ if (!content) -+ return; - -- child = node->children; -- -- while (child != NULL) -+ lang = xmlNodeGetLang (child); -+ if (lang == NULL) - { -- if (xmlStrEqual (child->name, (xmlChar *) "Bag")) -- { -- child = child->children; -- -- while (child != NULL) -- { -- if (xmlStrEqual (child->name, (xmlChar *) "li")) -- { -- subject = xmlNodeGetContent (child); -- *subjects = g_list_append (*subjects, subject); -- } -+ const char *translated; - -- child = child->next; -- } -+ translated = _((char *) content); -+ if ((char *) content != translated) -+ { -+ /* if we have a translation for the content of the -+ * node, then we just use this */ -+ if (*value) xmlFree (*value); -+ *value = (xmlChar *) g_strdup (translated); -+ *best_match = 0; - -+ xmlFree (content); - return; - } - -- child = child->next; -+ this_language = "C"; - } --#endif -+ else -+ this_language = (char *) lang; - -- subject = xmlNodeGetContent (node); - -- if (subject) -- { -- *subjects = g_list_append (*subjects, subject); -+ for (i = 0; locales[i] && i < *best_match; i++) { -+ if (!strcmp (locales[i], this_language)) { -+ /* if we've already encountered a less accurate -+ * translation, then free it */ -+ if (*value) xmlFree (*value); -+ -+ *value = xmlNodeGetContent (child); -+ *best_match = i; -+ -+ break; -+ } - } -+ -+ if (lang) xmlFree (lang); - } - - static void -@@ -862,43 +878,59 @@ parse_rdf_item (EphyBookmarks *bookmarks - xmlNodePtr node) - { - xmlChar *title = NULL; -+ int best_match_title = INT_MAX; - xmlChar *link = NULL; -+ int best_match_link = INT_MAX; -+ /* we consider that it's better to use a non-localized smart link than -+ * a localized link */ -+ gboolean use_smartlink = FALSE; -+ xmlChar *subject = NULL; - GList *subjects = NULL, *l = NULL; - xmlNode *child; -- EphyNode *bmk; -+ EphyNode *bmk = NULL; - - child = node->children; - --#ifdef OLD_RDF_TEMPORARY_HACK - link = xmlGetProp (node, (xmlChar *) "about"); --#endif - - while (child != NULL) - { - if (xmlStrEqual (child->name, (xmlChar *) "title")) - { -- title = xmlNodeGetContent (child); -+ parse_rdf_lang_tag (child, &title, &best_match_title); - } --#ifndef OLD_RDF_TEMPORARY_HACK -- else if (xmlStrEqual (child->name, (xmlChar *) "link")) -+ else if (xmlStrEqual (child->name, (xmlChar *) "link") && -+ !use_smartlink) - { -- link = xmlNodeGetContent (child); -+ parse_rdf_lang_tag (child, &link, &best_match_link); - } --#endif -- else if (xmlStrEqual (child->name, (xmlChar *) "subject")) -+ else if (child->ns && -+ xmlStrEqual (child->ns->prefix, (xmlChar *) "ephy") && -+ xmlStrEqual (child->name, (xmlChar *) "smartlink")) - { -- parse_rdf_subjects (child, &subjects); -+ if (!use_smartlink) -+ { -+ use_smartlink = TRUE; -+ best_match_link = INT_MAX; -+ } -+ -+ parse_rdf_lang_tag (child, &link, &best_match_link); - } -- else if (xmlStrEqual (child->name, (xmlChar *) "smartlink")) -+ else if (child->ns && -+ xmlStrEqual (child->ns->prefix, (xmlChar *) "dc") && -+ xmlStrEqual (child->name, (xmlChar *) "subject")) - { -- if (link) xmlFree (link); -- link = xmlNodeGetContent (child); -+ subject = xmlNodeGetContent (child); -+ if (subject) -+ subjects = g_list_prepend (subjects, subject); - } - - child = child->next; - } - -- bmk = bookmark_add (bookmarks, (char *) title, (char *) link); -+ if (title && link) -+ bmk = bookmark_add (bookmarks, (char *) title, (char *) link); -+ - if (bmk) - { - l = subjects; -Index: src/bookmarks/Makefile.am -=================================================================== ---- src/bookmarks/Makefile.am (révision 8368) -+++ src/bookmarks/Makefile.am (copie de travail) -@@ -107,6 +107,7 @@ libephybookmarks_la_CPPFLAGS = \ - -I$(top_srcdir)/embed \ - -I$(top_srcdir)/lib/widgets \ - -I$(top_srcdir)/lib/egg \ -+ -DDATADIR=\""$(pkgdatadir)"\" \ - $(AM_CPPFLAGS) - - libephybookmarks_la_CFLAGS = \ -Index: src/bookmarks/ephy-bookmarks.c -=================================================================== ---- src/bookmarks/ephy-bookmarks.c (révision 8368) -+++ src/bookmarks/ephy-bookmarks.c (copie de travail) -@@ -101,15 +101,6 @@ typedef struct - const char *location; - } EphyBookmarksBookmarkInfo; - --static const EphyBookmarksBookmarkInfo default_bookmarks [] = --{ -- /* Translators you should change these links to respect your locale. -- * For instance in .nl these should be -- * "http://www.google.nl" and "http://www.google.nl/search?q=%s" -- */ -- { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") } --}; -- - static const char *default_topics [] = - { - N_("Entertainment"), -@@ -151,13 +142,7 @@ ephy_bookmarks_init_defaults (EphyBookma - ephy_bookmarks_add_keyword (eb, _(default_topics[i])); - } - -- for (i = 0; i < G_N_ELEMENTS (default_bookmarks); i++) -- { -- EphyNode *bmk; -- -- bmk = ephy_bookmarks_add (eb, _(default_bookmarks[i].title), -- _(default_bookmarks[i].location)); -- } -+ ephy_bookmarks_import_rdf (eb, DATADIR "/default-bookmarks.rdf"); - } - - static void -Index: data/default-bookmarks.rdf.xml.in -=================================================================== ---- data/default-bookmarks.rdf.xml.in (révision 0) -+++ data/default-bookmarks.rdf.xml.in (révision 0) +diff -urN epiphany-2.27.4/data/default-bookmarks.rdf.xml.in epiphany-2.27.4.patched//data/default-bookmarks.rdf.xml.in +--- epiphany-2.27.4/data/default-bookmarks.rdf.xml.in 1970-01-01 01:00:00.000000000 +0100 ++++ epiphany-2.27.4.patched//data/default-bookmarks.rdf.xml.in 2009-07-20 22:32:43.000000000 +0200 @@ -0,0 +1,23 @@ + + @@ -247,11 +25,10 @@ Index: data/default-bookmarks.rdf.xml.in + <_ephy:smartlink>http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8 + + -Index: data/Makefile.am -=================================================================== ---- data/Makefile.am (révision 8368) -+++ data/Makefile.am (copie de travail) -@@ -60,6 +60,17 @@ service_DATA = $(service_in_files:.servi +diff -urN epiphany-2.27.4/data/Makefile.am epiphany-2.27.4.patched//data/Makefile.am +--- epiphany-2.27.4/data/Makefile.am 2009-04-17 08:06:40.000000000 +0200 ++++ epiphany-2.27.4.patched//data/Makefile.am 2009-07-20 22:39:09.000000000 +0200 +@@ -42,6 +42,17 @@ $(service_DATA): $(service_in_files) Makefile @sed -e "s|\@bindir\@|$(bindir)|" $< > $@ @@ -269,25 +46,24 @@ Index: data/Makefile.am install-data-local: $(schema_DATA) if GCONF_SCHEMAS_INSTALL -@@ -83,6 +94,7 @@ EXTRA_DIST = \ +@@ -63,6 +74,7 @@ $(xsl_DATA) \ $(service_DATA) \ $(m4data_DATA) \ + $(default_bookmarks_in_files) \ epiphany-service.xml \ - check-mime.py \ - generate-font-schemas.py -@@ -92,4 +104,5 @@ DISTCLEANFILES = \ + check-mime.py + +@@ -70,4 +82,5 @@ + $(service_DATA) \ $(schema_in_files:.schemas.in=.schemas) \ $(pkgconfig_DATA) \ - $(default_prefs_DATA) \ - $(desktop_DATA) -+ $(desktop_DATA) \ ++ $(desktop_DATA) \ + $(default_bookmarks_DATA) -Index: po/POTFILES.in -=================================================================== ---- po/POTFILES.in (révision 8368) -+++ po/POTFILES.in (copie de travail) +diff -urN epiphany-2.27.4/po/POTFILES.in epiphany-2.27.4.patched//po/POTFILES.in +--- epiphany-2.27.4/po/POTFILES.in 2009-06-05 23:42:54.000000000 +0200 ++++ epiphany-2.27.4.patched//po/POTFILES.in 2009-07-20 22:32:43.000000000 +0200 @@ -2,6 +2,7 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. @@ -296,3 +72,48 @@ Index: po/POTFILES.in data/epiphany.desktop.in.in data/epiphany-lockdown.schemas.in data/epiphany.schemas.in +diff -urN epiphany-2.27.4/src/bookmarks/ephy-bookmarks.c epiphany-2.27.4.patched//src/bookmarks/ephy-bookmarks.c +--- epiphany-2.27.4/src/bookmarks/ephy-bookmarks.c 2009-04-17 08:06:40.000000000 +0200 ++++ epiphany-2.27.4.patched//src/bookmarks/ephy-bookmarks.c 2009-07-20 22:32:43.000000000 +0200 +@@ -100,15 +100,6 @@ + const char *location; + } EphyBookmarksBookmarkInfo; + +-static const EphyBookmarksBookmarkInfo default_bookmarks [] = +-{ +- /* Translators you should change these links to respect your locale. +- * For instance in .nl these should be +- * "http://www.google.nl" and "http://www.google.nl/search?q=%s" +- */ +- { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") } +-}; +- + static const char *default_topics [] = + { + N_("Entertainment"), +@@ -152,13 +143,7 @@ + ephy_bookmarks_add_keyword (eb, _(default_topics[i])); + } + +- for (i = 0; i < G_N_ELEMENTS (default_bookmarks); i++) +- { +- EphyNode *bmk; +- +- bmk = ephy_bookmarks_add (eb, _(default_bookmarks[i].title), +- _(default_bookmarks[i].location)); +- } ++ ephy_bookmarks_import_rdf (eb, DATADIR "/default-bookmarks.rdf"); + } + + static void +diff -urN epiphany-2.27.4/src/bookmarks/Makefile.am epiphany-2.27.4.patched//src/bookmarks/Makefile.am +--- epiphany-2.27.4/src/bookmarks/Makefile.am 2009-04-17 08:06:40.000000000 +0200 ++++ epiphany-2.27.4.patched//src/bookmarks/Makefile.am 2009-07-20 22:32:43.000000000 +0200 +@@ -111,6 +111,7 @@ + -I$(top_srcdir)/embed \ + -I$(top_srcdir)/lib/widgets \ + -I$(top_srcdir)/lib/egg \ ++ -DDATADIR=\""$(pkgdatadir)"\" \ + $(AM_CPPFLAGS) + + libephybookmarks_la_CFLAGS = \ diff --git a/epiphany-browser-plugins.patch b/epiphany-browser-plugins.patch deleted file mode 100644 index c31a9f4..0000000 --- a/epiphany-browser-plugins.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- embed/mozilla/Makefile.am -+++ embed/mozilla/Makefile.am -@@ -143,6 +143,7 @@ - -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \ - -DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \ - -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ -+ -DSUSE_PLUGINSDIR=\"$(libdir)/browser-plugins\" \ - -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \ - -DALLOW_PRIVATE_API \ - $(AM_CPPFLAGS) ---- embed/mozilla/mozilla-embed-single.cpp -+++ embed/mozilla/mozilla-embed-single.cpp -@@ -366,8 +366,7 @@ - MOZILLA_PREFIX "/lib/mozilla/plugins"); - list = mozilla_init_plugin_add_unique_path (list, - MOZILLA_HOME "/plugins"); -- list = mozilla_init_plugin_add_unique_path (list, -- MOZILLA_NATIVE_PLUGINSDIR); -+ list = mozilla_init_plugin_add_unique_path (list, SUSE_PLUGINSDIR); - #ifdef HAVE_PRIVATE_PLUGINS - list = mozilla_init_plugin_add_unique_path (list, PLUGINDIR); - #endif diff --git a/epiphany-libtool.patch b/epiphany-libtool.patch deleted file mode 100644 index cf572ae..0000000 --- a/epiphany-libtool.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -455,6 +455,7 @@ if test "$have_python" != "no"; then - AM_CHECK_PYTHON_HEADERS([],[have_python=no]) - fi - -+m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - if test "$have_python" != "no"; then - PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'` - PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'` diff --git a/epiphany-user-agent.patch b/epiphany-user-agent.patch new file mode 100644 index 0000000..5a2dc2b --- /dev/null +++ b/epiphany-user-agent.patch @@ -0,0 +1,89 @@ +diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in +index a847aa2..98f8db2 100644 +--- a/data/epiphany.schemas.in ++++ b/data/epiphany.schemas.in +@@ -478,6 +478,17 @@ + Browse with caret + + ++ ++ /schemas/apps/epiphany/web/user_agent_vendor ++ /apps/epiphany/web/user_agent_vendor ++ epiphany ++ string ++ GNOME.org ++ ++ Vendor to include in the user agent ++ String that will be appended to the user agent, containing vendor-specific information. ++ ++ + + /schemas/apps/epiphany/general/managed_network + /apps/epiphany/general/managed_network +diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c +index c1a14df..8c8f19b 100644 +--- a/embed/ephy-embed-prefs.c ++++ b/embed/ephy-embed-prefs.c +@@ -134,6 +134,38 @@ webkit_pref_callback_user_stylesheet (GConfClient *client, + } + + static void ++webkit_pref_callback_user_agent_vendor (GConfClient *client, ++ guint cnxn_id, ++ GConfEntry *entry, ++ gpointer data) ++{ ++ GConfValue *gcvalue; ++ const char *value = NULL; ++ static char *webkit_user_agent = NULL; ++ char *user_agent = NULL; ++ char *webkit_pref = data; ++ ++ gcvalue = gconf_entry_get_value (entry); ++ ++ /* happens on initial notify if the key doesn't exist */ ++ if (gcvalue != NULL && ++ gcvalue->type == GCONF_VALUE_STRING) { ++ value = gconf_value_get_string (gcvalue); ++ } ++ ++ if (webkit_user_agent == NULL) { ++ g_object_get (G_OBJECT(settings), "user-agent", &webkit_user_agent, NULL); ++ } ++ ++ user_agent = g_strconcat (webkit_user_agent, " ", ++ "Epiphany/"VERSION, value ? " " : NULL, ++ value, NULL); ++ ++ g_object_set (settings, webkit_pref, user_agent, NULL); ++ g_free (user_agent); ++} ++ ++static void + webkit_pref_callback_font_size (GConfClient *client, + guint cnxn_id, + GConfEntry *entry, +@@ -228,7 +260,10 @@ static const PrefData webkit_pref_entries[] = + webkit_pref_callback_user_stylesheet }, + { CONF_CARET_BROWSING_ENABLED, + "enable-caret-browsing", +- webkit_pref_callback_boolean } ++ webkit_pref_callback_boolean }, ++ { CONF_USER_AGENT_VENDOR, ++ "user-agent", ++ webkit_pref_callback_user_agent_vendor } + }; + + static void +diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h +index ada4ac8..cbe7423 100644 +--- a/embed/ephy-embed-prefs.h ++++ b/embed/ephy-embed-prefs.h +@@ -41,6 +41,7 @@ + #define CONF_DISPLAY_SMOOTHSCROLL "/apps/epiphany/web/smooth_scroll" + #define CONF_WEB_INSPECTOR_ENABLED "/apps/epiphany/web/inspector_enabled" + #define CONF_CARET_BROWSING_ENABLED "/apps/epiphany/web/browse_with_caret" ++#define CONF_USER_AGENT_VENDOR "/apps/epiphany/web/user_agent_vendor" + + /* These are defined gnome wide now */ + #define CONF_NETWORK_PROXY_MODE "/system/proxy/mode" diff --git a/epiphany.changes b/epiphany.changes index b8684f7..1c66bc3 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Mon Aug 3 22:56:06 CEST 2009 - vuntz@novell.com + +- Update to version 2.27.5: + + Use the font families set in the GNOME preferences when + possible. + + Fix opening multiple pages in a row from command line + (bgo#588143) + + Add several new mime types to the safe mime types list + (bgo#582905, bgo#565346) + + Fix middle click on back/forward buttons (bgo#583440) + + Recognize favicons with mime type image/vnd.microsoft.icon. + Keep in mind that favicons in general still do not work in + epiphany/webkit. (bgo#578575) +- Add gir-repository, gobject-introspection-devel and libseed-devel + BuildRequires. +- Pass --enable-introspection and --enable-seed to configure. +- Add lsb-release BuildRequires. +- Add epiphany-user-agent.patch so we can brand the user agent. +- Remove AutoReqProv from devel package: it's default now. +- Remove python-gtk, python-gnome Requires. +- Add libwebkit-devel and epiphany Requires to the devel package. + +------------------------------------------------------------------- +Mon Jul 20 19:37:38 CEST 2009 - dominique-obs@leuenberger.net + +- Update to version 2.27.4: + + Too many changes to list. + + Epiphany now uses webkit. +- Remove now unneeded enchant-devel, gnome-desktop-devel, + libglade2-devel, libgnomeui-devel and mozilla-xulrunner from + BuildRequires +- Add gconf2-devel, libnotify-devel, startup-notification-devel and + libwebkit-devel to BuildRequires. +- Remove AutoReqProv: it's default now. +- Remove obsolete --with-gecko and --enable-spell-checker from + configure. +- Do not set categories in desktop files when they are already + there. +- Remove part of the branding package that was specific to the + gecko backend. This was used to set the user agent. Webkit + doesn't support this for now, but this should be added back in + the future. +- Update epiphany-bgo300190-default-bookmarks.patch: part of it was + accepted upstream. +- Drop epiphany-browser-plugins.patch: WebKit does the right thing. +- Drop epiphany-libtool.patch +- Change sr@Latin to sr@latin + ------------------------------------------------------------------- Sun Mar 15 19:17:17 CET 2009 - vuntz@novell.com diff --git a/epiphany.spec b/epiphany.spec index 733c47e..41b13af 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany (Version 2.26.0) +# spec file for package epiphany (Version 2.27.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,90 +19,66 @@ Name: epiphany -%define xulrunner_version 190 BuildRequires: NetworkManager-devel -BuildRequires: enchant-devel BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: gconf2-devel +BuildRequires: gir-repository BuildRequires: gnome-common -BuildRequires: gnome-desktop-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-icon-theme BuildRequires: gnome-themes +BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: iso-codes-devel BuildRequires: libavahi-gobject-devel -BuildRequires: libglade2-devel -BuildRequires: libgnomeui-devel +BuildRequires: libnotify-devel +BuildRequires: libseed-devel +BuildRequires: libsoup-devel +BuildRequires: libwebkit-devel BuildRequires: libxslt-devel -BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel -BuildRequires: python-devel -BuildRequires: python-gnome-devel -BuildRequires: python-gtk-devel +BuildRequires: lsb-release +BuildRequires: startup-notification-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -%define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner%{xulrunner_version}) -Requires: mozilla-xulrunner%{xulrunner_version} => %{mozilla_ver} -Version: 2.26.0 +Version: 2.27.5 Release: 1 -Requires: %{name}-lang = %{version} +%define major_version 2.27 License: GPL v2 or later Group: Productivity/Networking/Web/Browsers Summary: GNOME Web Browser Based on the Mozilla Rendering Engine Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE epiphany-browser-plugins.patch bnc222861 -- Handle suse specific plugins dir -Patch1: epiphany-browser-plugins.patch -# PATCH-FIX-OPENSUSE epiphany-libtool.patch -- Create libtool before use -Patch4: epiphany-libtool.patch +# PATCH-FEATURE-UPSTREAM epiphany-user-agent.patch bgo580903 vuntz@novell.com -- Set user agent with a vendor part, via a gconf key +Patch0: epiphany-user-agent.patch # PATCH-FEATURE-UPSTREAM epiphany-bgo300190-default-bookmarks.patch bgo300190 vuntz@novell.com -- Use rdf to specify default bookmarks Patch5: epiphany-bgo300190-default-bookmarks.patch # PATCH-FEATURE-OPENSUSE epiphany-safe-one-click-install.patch bnc330070 vuntz@novell.com -- Make one-click install work with one-click Patch6: epiphany-safe-one-click-install.patch Url: http://www.gnome.org/projects/epiphany/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: python-gtk python-gnome iso-codes gnome-icon-theme +Requires: iso-codes gnome-icon-theme +Requires: %{name}-lang = %{version} Requires: %{name}-branding -AutoReqProv: on %gconf_schemas_prereq %description Epiphany is a Web browser for the GNOME Desktop. Its principles are simplicity and standards compliance. - - -Authors: --------- - Marco Pesenti Gritti - Xan Lopez - Christian Persch - Adam Hooper - Jean-François Rameau - Crispin Flowerday - %package devel License: GPL v2 or later Summary: GNOME Web Browser based on the Mozilla Rendering Engine Group: Development/Libraries/GNOME -Requires: gtk2-devel libxml2-devel -AutoReqProv: on +Requires: %{name} = %{version} +Requires: gtk2-devel +Requires: libwebkit-devel +Requires: libxml2-devel %description devel Epiphany is a Web Browser for the GNOME Desktop. Its principles are simplicity and standards compliance. - - -Authors: --------- - Marco Pesenti Gritti - Xan Lopez - Christian Persch - Adam Hooper - Jean-François Rameau - Crispin Flowerday - %package doc License: GPL v2 or later Summary: Developer Documentation for Epiphany @@ -115,17 +91,6 @@ simplicity and standards compliance. This package contains developer documentation for epiphany. - - -Authors: --------- - Marco Pesenti Gritti - Xan Lopez - Christian Persch - Adam Hooper - Jean-François Rameau - Crispin Flowerday - %package branding-upstream License: GPL v2 or later Summary: Upstream branding of Epiphany @@ -136,54 +101,44 @@ Supplements: packageand(%{name}:branding-upstream) #BRAND: Provide a few files - #BRAND: /usr/share/epiphany/default-bookmarks.rdf #BRAND: the default bookmarks -#BRAND: /usr/share/epiphany/chrome/branding/brand.dtd -#BRAND: /usr/share/epiphany/chrome/branding/brand.properties -#BRAND: branding information that can be patched %description branding-upstream This package provides upstream Look and Feel for Epiphany. - - -Authors: --------- - Marco Pesenti Gritti - Xan Lopez - Christian Persch - Adam Hooper - Jean-François Rameau - Crispin Flowerday - %lang_package %prep %setup -q translation-update-upstream -%patch1 -%patch4 -%patch5 +%patch0 -p1 +%patch5 -p1 %patch6 -p1 %build ACLOCAL="aclocal -I m4" autoreconf -f -i %configure \ --disable-scrollkeeper \ - --with-gecko=libxul-embedding \ --enable-dbus \ --enable-zeroconf \ --enable-network-manager \ - --enable-spell-checker + --enable-introspection \ + --enable-seed %__make %{?jobs:-j%jobs} %install %makeinstall mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps ln -s ../icons/gnome/scalable/apps/web-browser.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -%suse_update_desktop_file -N "Epiphany" %name Network WebBrowser -%suse_update_desktop_file bme System Network +# In case make install did not create the extensions folder +if ! test -d %{buildroot}%{_libdir}/epiphany/%{major_version}/extensions; then + install -d -m 0755 %{buildroot}%{_libdir}/epiphany/%{major_version}/extensions +fi +%suse_update_desktop_file -N "Epiphany" %name +%suse_update_desktop_file bme System +# Change sr@Latn to sr@latin +mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin %find_lang %{name} %find_gconf_schemas cat %{name}.schemas_list >%{name}.lst -rm $RPM_BUILD_ROOT%{_libdir}/*/*/*/*.*a %fdupes $RPM_BUILD_ROOT %clean @@ -192,6 +147,7 @@ rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre %post -p /sbin/ldconfig + %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun @@ -205,16 +161,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/org.gnome.Epiphany.service %exclude %{_datadir}/epiphany/default-bookmarks.rdf -%exclude %{_datadir}/epiphany/chrome/branding/* %{_datadir}/epiphany +%{_datadir}/gir-1.0/*.gir %dir %{_datadir}/icons/LowContrastLargePrint %dir %{_datadir}/icons/LowContrastLargePrint/48x48 %dir %{_datadir}/icons/LowContrastLargePrint/48x48/apps %{_datadir}/icons/*/*/apps/*.png %{_datadir}/icons/hicolor/*/apps/*.svg %{_datadir}/pixmaps/*.svg -%{_datadir}/pygtk/2.0/defs/epiphany.defs %{_libdir}/epiphany +%{_libdir}/girepository-1.0/*.typelib %doc %{_mandir}/man1/epiphany.1.gz %files lang -f %{name}.lang @@ -232,427 +188,5 @@ rm -rf $RPM_BUILD_ROOT %files branding-upstream %defattr(-,root,root) %{_datadir}/epiphany/default-bookmarks.rdf -%{_datadir}/epiphany/chrome/branding/* %changelog -* Sun Mar 15 2009 vuntz@novell.com -- Update to version 2.26.0: - + Another NULL check for bgo#572810. - + Try again to fix gecko 1.9.1 build. bgo#565669 - + Updated translations. -- Remove -fno-strict-aliasing from CFLAGS. -- Pass --enable-spell-checker to configure. -- Do not package omf files twice (they are in the lang package - too). -* Tue Feb 17 2009 vuntz@novell.com -- Update to version 2.25.91: - + Do not use 'gtk-action' object data to get the associated - GtkAction for a widget. - + Update EggEditableToolbar from trunk. - + Fix build with gecko 1.9.1. - + Add backward compat engine definition in pkg-config file. - + Updates translations. -* Mon Feb 16 2009 sbrabec@suse.cz -- Added support for translation-update-upstream (FATE#301344). -* Wed Feb 04 2009 vuntz@novell.com -- Reduce BuildRequires: we don't need libgnomeprintui, eg. Add - libgnomeui-devel, though. -* Sat Jan 31 2009 mboman@suse.de -- Update to version 2.25.5: - + Avoid adding problematic search terms with spaces - + Handle end of line correctly on location bar search - + Implement multiple keyword-based AND-search for the location bar - + Include a bookmark indication in the woohoo bar - + Turn the location bar into the woohoo bar - + Fix bookmark import of ff3 files - + Translation updates -* Mon Dec 29 2008 mboman@suse.de -- Update to version 2.24.2.1: - + Fix multi-dnd with gtk 2.14 - + Fix bgo#549361 - + Translation updates -* Sat Dec 13 2008 vuntz@novell.com -- Add epiphany-safe-one-click-install.patch to make one-click - install work. Fix bnc#330070. -* Wed Oct 22 2008 mboman@suse.de -- Update to version 2.24.1: - + Bugs fixed: bgo#525357, bgo#535127, bgo#543335, bgo#549892, bgo#554110 - bgo#554110, bgo#555170 - + Set nsNavHistory prefs, esp. the idle update frequency to 0. - + Use the correct return type for ephy_embed_get_link_message and - ephy_embed_get_title - + Translation updates -* Mon Oct 06 2008 sbrabec@suse.cz -- Conflict with other branding providers (FATE#304881). -* Wed Oct 01 2008 mboman@suse.de -- Update to version 2.24.0.1: - + Fix for GTK+ adjustment policy enforcement - + Bugs fixed: bgo#552436, bgo#552555, bgo#550883, bgo#448613, - bgo#426349 - + Translation updates -* Thu Sep 18 2008 maw@suse.de -- Build against mozilla-xulrunner190. -* Thu Sep 11 2008 vuntz@novell.com -- Don't put the branding files in the epiphany package too. -- .spec cleaning: - + Correctly use packageand(). - + Remove checks from old openSUSE versions. - + Make the spec file UTF-8. -* Wed Sep 03 2008 mboman@novell.com -- Update to version 2.23.91: - + Remove deprecated Encoding line. - + Remove leading dots in suggested filename. Fixes bgo#430965 - + Misc. identation fixes. -* Tue Aug 26 2008 mboman@novell.com -- Update to version 2.23.5: - + Allow remembering the selected user cert. - + Bug fixes: bgo#547936, bgo#151932, bgo#343906, bgo#328162, - bgo#534218, bgo#517960 -* Fri Aug 08 2008 maw@suse.de -- Update to version 2.23.5: - + Initial release for GNOME 2.24 - + Bugs fixed (since 2.23.2): bgo#529634 and bgo#541168. -* Wed Jul 30 2008 vuntz@novell.com -- Add epiphany-bgo300190-default-bookmarks.patch to specify - default bookmarks via a RDF file. (bgo#300190) -- Remove epiphany-default-bookmarks.patch: this will go in a - separate branding package. -- Add epiphany-branding-upstream package. -* Fri Jul 18 2008 rodrigo@suse.de -- Fixed tagging of patches -* Wed Jun 18 2008 maw@suse.de -- Update to version 2.22.2: - + Various bugxies -- Drop obsolete patches: epiphany-po-update.patch and - ephy-no-cookies-selected.patch. -* Wed May 21 2008 maw@suse.de -- Use >=, not =, to require xulrunner versions (bnc#371145). -* Sat May 17 2008 maw@suse.de -- Add ephy-no-cookies-selected.patch (bgo#504136, bnc#391683). -* Wed May 07 2008 schwab@suse.de -- Create libtool before use. -* Fri May 02 2008 sbrabec@suse.cz -- Translation fix from SVN. -* Thu Apr 10 2008 maw@suse.de -- Update to version 2.22.1.1: - + Revert the bookmark/history item no-dupes patch; it was slowing - down ephy - + Remove the unnecessary setting of the preferred action in the - cases that action was going to be the default one anyway; don't - open twice, just let gecko handle opening in the preferred - application - + Make the extra column pack-end so that when we hide it when - it's empty, the other column expands; this makes bookmarks - take up all the space instead of being truncated at the half - + Bugs fixed: - * Use ephy_password_info_new to allocate EphyPasswordInfo, not - g_new; fixes a crash in the PDM passwords tab - * Fix multiple crashers in the zeroconf bookmarks (bgo#516008) - * Use g_slice for EphyCookie allocation (bgo#520560) - * Use g_slice for EphyPasswordInfo, EphyPermissionInfo, - PixbufCacheEntry (bgo#521017) - + Updated translations -- Drop epiphany-avahi-bookmarks.patch. -* Wed Mar 26 2008 sbrabec@suse.cz -- Fixed crashes in avahi bookmarks processing (bgo#516008). -* Fri Mar 21 2008 jpr@suse.de -- Remove obsolete -devel requires -- Remove obsolete version checks -- Remove patch that was purposely disabled -- Don't create the extensions dir manually, there is a defaul plugin - that does it for us -- Remove epiphany-desktop.patch, the GenericName is correct and there - is no reason to hide the desktop file -- Remove 59950.diff, its obsolete by a fix in a different spot see - bgo #165445 -- Remove 59949.diff, its obsolete by a fix in a differenct spot, see - bgo #142184 -- Remove epiphany-no-root.patch, --disable-scrollkeeper works fine - now -* Fri Mar 14 2008 maw@suse.de -- Update to version 2.22.0: - + Bug fixes - + Updated translations. -* Thu Mar 13 2008 sbrabec@suse.cz -- Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE. -* Tue Mar 04 2008 maw@suse.de -- Update to version 2.21.92: - + Bug fixes -- No longer build with the cert manager -- Remove epiphany-gcc4.3-fixes.patch. -* Tue Feb 12 2008 jpr@suse.de -- Fix missing directory ownership -- Update to use -p /sbin/ldconfig -* Fri Feb 01 2008 maw@suse.de -- Update to version 2.21.90: - + Drop gnome-vfs in lieu of gio - + Many bug fixes. -* Wed Nov 07 2007 maw@suse.de -- Update to version 2.20.1 (another cosmetic version bump) -- Add epiphany-gcc4.3-fixes.patch. -* Thu Oct 11 2007 sbrabec@suse.cz -- Removed bogus dependency on mDNSResponder. -* Mon Sep 17 2007 mauro@suse.de -- Bump version and API version to 2.20. -* Fri Aug 31 2007 maw@suse.de -- Update to version 2.19.91: - + Compilation fixes for ancient compilers - + Some typo changes - + Icon reorg - + Minor bug fixes. -* Wed Aug 22 2007 maw@suse.de -- Add default-bookmarks.patch, which adds http://news.opensuse.org - as a default bookmark (#293690). -* Fri Aug 10 2007 coolo@suse.de -- put Version before the use of %%version -* Wed Aug 08 2007 maw@suse.de -- Split off a -lang subpackage -- s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun. -* Thu Aug 02 2007 maw@suse.de -- Update to version 2.19.6: - + Experimental WebKit backend [not enabled in this build] - + New (copied) lock icons - + Sync with latest libegg - + New checkbox for smooth scrolling - + Use g_get_user_special_dir to determine Desktop and Downloads - directory locations - + Use new gtk function to persist and load print settings and - page setup - + All tooltips now created using the new GTK tooltip API - + Minor string changes - + Bugs (bugzilla.gnome.org) fixed: 452769, 450590, 450146, -- Use %%fdupes. -* Sat Jul 14 2007 aj@suse.de -- It's really libwnck-devel. -* Mon Jul 09 2007 maw@suse.de -- Update to version 2.19.2 -- Fixes for bugzilla.gnome.org #348350, #452769, #450590, #450146, - [#346243], #351100, #433796 , #441419, #336739, #422114, #437798, - [#162489], and #162489 -- Buildrequire libwnck-1-22-devel instead of libwnck-devel. -* Mon May 28 2007 sbrabec@suse.cz -- Update to version 2.18.1: - * Fixed printing of frames. - * Fixed Epiphany not finding some Gecko plugins. -- Removed Flash crash work-around (upstream part of ephy-main.c). -* Tue Apr 03 2007 maw@suse.de -- Remove all references to - epiphany-dbus-connection-close-fix-thoenig-01.patch (#260495). -* Mon Apr 02 2007 maw@suse.de -- Update to version 2.18.0 -- b.g.o 416994, 348331, 404514 -- Fix several .desktop files to remove invalid Category entries. -* Mon Mar 12 2007 jhargadon@suse.de -- added gtk-doc to the BuildRequires -* Wed Jan 10 2007 sbrabec@suse.cz -- Enabled NetworkManager support. -* Wed Jan 03 2007 sbrabec@suse.cz -- Spec file cleanup. -* Fri Dec 29 2006 maw@suse.de -- Move to /usr. -* Fri Dec 29 2006 james@usr-local-bin.org -- Fix %%post. -* Thu Dec 28 2006 jhargadon@suse.de -- removed unneeded libtool file (#223685) -* Thu Nov 30 2006 sbrabec@suse.cz -- Fixed xulrunner dependencies for older products. -* Tue Nov 21 2006 jhargadon@suse.de -- re-enabled patch epiphany-browser-plugins.patch (#222861) -* Fri Nov 17 2006 thoenig@suse.de -- Add patch epiphany-dbus-connection-close-fix-thoenig-01.patch: Do - not call dbus_connection_close on shared connection (b.n.c - [#221827]) -* Tue Nov 07 2006 sbrabec@suse.cz -- Use exact xulrunner version 181 (#216100). -* Tue Nov 07 2006 meissner@suse.de -- use RPM_OPT_FLAGS for C++ too. -* Fri Oct 13 2006 danw@suse.de -- Remove dead patches, update and reenable epiphany-desktop.patch - and epiphany-flash-crash.patch -- Update for gnome-doc-utils-devel -* Mon Oct 02 2006 jhargadon@suse.de -- update to version 2.16.1 -- Add a window group for the history window. -- Fix compile warnings -- Add smb: to recognised web schemes -- Fix spinner with new g-i-t -- Fix a crash when failing to load some icon data -* Thu Sep 14 2006 jhargadon@suse.de -- update to version 2.16.0 -- Update API version for 2.16 -- Add some more mime types. Fixes bug #352482 -* Sat Sep 02 2006 gekker@suse.de -- Install dbus service file in correct location -* Thu Aug 24 2006 jhargadon@suse.de -- update to version 2.15.92 -- translation updates -- Spell check support using the gecko 'spellchecker' extension -- Add page security info dialogue from Certificates extension -- Drop libgnomeprint[ui] and use gtk printing -- Add methods to EphyNode to set typed properties -- Add a way to turn off password remembering -- Don't crash when adding zeroconf bookmarks while bookmarks are locked - down -- Fix middle-click and ctrl-enter in the location entry autocompletion - drop-down -- Make the crash recovery dialog appear on the taskbar -- copy history over when opening link in new tab/win using - context menu -- Don't crash on error from zeroconf bookmarks -- Don't set cookies from favicon downloads -- Allow cookie list to be sorted -- Fix crash when moving zoom widget on toolbar -- Display the find bar for "Find Next" and "Find Previous" - if it wasn't visible already -- Remove Shift+Ctrl+T accelerator, it was pressed accidentally - too often and people would lose their toolbars -* Wed Aug 16 2006 ro@suse.de -- added python-gnome-devel to BuildRequires -* Wed Aug 16 2006 cthiel@suse.de -- require python-gtk-devel instead of python-gobject2-devel -* Wed Aug 16 2006 ro@suse.de -- added python-gobject2-devel to BuildRequires -* Thu Jun 29 2006 lrupp@suse.de -- Requires: mozilla-xulrunner180 for suse_version > 1010 -* Mon Mar 06 2006 sbrabec@suse.cz -- Search plugins in browser-plugins directory (#154443). -* Wed Mar 01 2006 sbrabec@suse.cz -- Updated to version 1.8.5 (fixes 150372#4). -* Mon Feb 27 2006 ro@suse.de -- added kdelibs3-devel-doc to BuildRequires -* Mon Feb 20 2006 sbrabec@suse.cz -- Enabled password manager (#150372). -* Thu Feb 16 2006 sbrabec@suse.cz -- Worked around flash plugin crash (#149062). -* Thu Feb 16 2006 stbinner@suse.de -- fix Name in .desktop file -* Sun Feb 05 2006 mls@suse.de -- added mozilla-xulrunner to BuildRequires -* Thu Feb 02 2006 sbrabec@suse.cz -- Explicitly require iso-codes (#147467). -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Nov 30 2005 gekker@suse.de -- Update to version 1.8.3 -- Remove upstreamed xulrunner patch -* Wed Nov 16 2005 sbrabec@suse.cz -- Fixed mozilla/xulrunner dependencies. -* Tue Nov 15 2005 sbrabec@suse.cz -- Removed unneeded packages for build to break build cycle. -- Enable Zeroconf support. -* Tue Nov 08 2005 sbrabec@suse.cz -- Create xulrunner default prefs. -* Mon Oct 24 2005 sbrabec@suse.cz -- Fixed extension directories. -* Mon Oct 17 2005 sbrabec@suse.cz -- Updated to version 1.8.2. -- Added xulrunner patch. -* Mon Sep 05 2005 sbrabec@suse.cz -- Updated to version 1.8.0. -* Wed Aug 24 2005 gekker@suse.de -- Updated to version 1.7.5 -* Fri Aug 12 2005 sbrabec@suse.cz -- Fixed requirement to not require symbols provided only by - mozilla-nss and mozilla-nspr packages (#98002). -* Fri Aug 05 2005 sbrabec@suse.cz -- Updated to version 1.7.3. -* Wed Aug 03 2005 sbrabec@suse.cz -- Updated to version 1.6.4. -- Turned on D-BUS support. -* Sat Mar 19 2005 clahey@suse.de -- Remove Bookmarks desktop entry. -* Wed Mar 09 2005 gekker@suse.de -- Updated to version 1.6.0 (GNOME 2.10) -* Fri Mar 04 2005 gekker@suse.de -- Updated to version 1.5.8 -* Wed Feb 09 2005 hhetter@suse.de -- updated to version 1.5.6 -* Mon Feb 07 2005 gekker@suse.de -- Update to 1.5.5 -* Sat Feb 05 2005 meissner@suse.de -- 2 falses should be NULL -* Tue Feb 01 2005 ro@suse.de -- fix compile warning -* Fri Jan 14 2005 clahey@suse.de -- Updated to 1.5.4. -* Fri Jan 14 2005 ro@suse.de -- update to 1.4.7 to accept mozilla 1.7.5 -* Wed Dec 15 2004 hvogel@suse.de -- fix desktop file -* Fri Nov 19 2004 ro@suse.de -- removed extra aclocal include directive -* Mon Nov 08 2004 ro@suse.de -- fix build with current intltool -* Wed Oct 27 2004 mmj@suse.de -- Locale rename no to nb -* Thu Sep 23 2004 sbrabec@suse.cz -- Fixed bad LD_LIBRARY_PATH in wrapper script (#45909). -* Fri Sep 10 2004 sbrabec@suse.cz -- Minimal patch to compile with actual version of mozilla. -* Sat Sep 04 2004 ro@suse.de -- remove epiphany.desktop in install-section, not in postinstall -* Fri Sep 03 2004 sagarwal@suse.de -- Modified the spec file to delete epiphany.desktop, web-browser.desktop - is used for epiphany browser, and epiphany.desktop creates redundant - menu entry. -* Tue Aug 24 2004 ro@suse.de -- backport some hunks from 1.2.7 to build with mozilla-1.7.2 -* Tue Jul 20 2004 rganesan@suse.de -- Modified patch for 59950(59950.diff) -* Fri Jul 16 2004 rganesan@suse.de --Patch for ximian bug 59949 -* Fri Jul 16 2004 rganesan@suse.de --Patch for bug 59950 -* Wed Jul 14 2004 rganesan@suse.de -- patch for ximian bug 58913 -* Thu Jul 01 2004 hhetter@suse.de -- set default startup page -* Wed May 26 2004 ro@suse.de -- update to 1.2.5 to build with mozilla-1.7 -* Tue May 11 2004 sbrabec@suse.cz -- Added empty directories /opt/gnome/%%_lib/epiphany and - /opt/gnome/%%_lib/epiphany/extensions to filelist. -* Fri Apr 30 2004 hhetter@suse.de -- updated to version 1.2.2 [GNOME2.6] -- seperate gtk-doc documentation package -* Wed Mar 10 2004 sbrabec@suse.cz -- Fixed gconf schemas installation (#33114). -* Fri Mar 05 2004 hhetter@suse.de -- suse homepage as startpage -* Fri Feb 20 2004 sbrabec@suse.cz -- Fixed names of GNOME2 packages. -* Tue Feb 17 2004 adrian@suse.de -- use Network Category, instead of Internet -* Thu Feb 12 2004 hhetter@suse.de -- gconf schema (de-)installation in %%post and %%postun -* Thu Jan 29 2004 ro@suse.de -- update to 1.0.7 to fix build with mozilla 1.6 -* Sat Jan 10 2004 adrian@suse.de -- build as user -* Mon Nov 10 2003 hhetter@suse.de -- updated to version 1.0.6 -* Thu Nov 06 2003 hhetter@suse.de -- updated to version 1.0.5 -* Mon Oct 27 2003 sbrabec@suse.cz -- Updated to version 1.0.4. -* Fri Oct 17 2003 hhetter@suse.de -- updated to version 1.0.3 -* Wed Oct 15 2003 hhetter@suse.de -- updated to version 1.0.2 -- use aclocal -* Tue Sep 09 2003 hhetter@suse.de -- updated to version 1.0 (minor bugfixes and translations) -* Tue Sep 02 2003 hhetter@suse.de -- updated to version 0.9.3 (translations only) -* Mon Aug 25 2003 sbrabec@suse.cz -- Updated to version 0.9.2. -* Tue Aug 19 2003 sbrabec@suse.cz -- Updated neededforbuild (rename of librsvg2, eel2). -* Tue Aug 12 2003 adrian@suse.de -- add Categories -* Mon Aug 11 2003 hhetter@suse.de -- updated to bugfix release 0.8.4 -* Mon Aug 04 2003 hhetter@suse.de -- updated to bugfix release 0.8.2 -* Mon Jul 28 2003 hhetter@suse.de -- initial SuSE package