diff --git a/epiphany-2.30.6.tar.bz2 b/epiphany-2.30.6.tar.bz2 deleted file mode 100644 index 1376fba..0000000 --- a/epiphany-2.30.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc -size 5927938 diff --git a/epiphany-3.0.0.tar.bz2 b/epiphany-3.0.0.tar.bz2 new file mode 100644 index 0000000..4cb3ef8 --- /dev/null +++ b/epiphany-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9407220e21e95008b0c5b0a0383d1bdc56a932c40a4486ea4f996ba47eeae7bb +size 5844463 diff --git a/epiphany-fix-introspection-build.patch b/epiphany-fix-introspection-build.patch deleted file mode 100644 index d180f27..0000000 --- a/epiphany-fix-introspection-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 78b9eac0fca36e27c83c7678b18962ba286f041b -Author: Vincent Untz -Date: Fri Oct 1 18:36:23 2010 +0200 - - introspection: Fix build by telling g-ir-scanner what the prefix is - - https://bugzilla.gnome.org/show_bug.cgi?id=631119 - -Index: epiphany-2.30.6/src/Makefile.am -=================================================================== ---- epiphany-2.30.6.orig/src/Makefile.am -+++ epiphany-2.30.6/src/Makefile.am -@@ -350,6 +350,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $( - --include=WebKit-1.0 \ - --program=./epiphany \ - --output $@ \ -+ --strip-prefix=Ephy \ - --pkg epiphany-$(EPIPHANY_API_VERSION) \ - -DEPIPHANY_COMPILATION \ - -I$(top_srcdir)/embed \ -Index: epiphany-2.30.6/src/Makefile.in -=================================================================== ---- epiphany-2.30.6.orig/src/Makefile.in -+++ epiphany-2.30.6/src/Makefile.in -@@ -1594,6 +1594,7 @@ stamp-ephy-dbus-client-bindings.h: $(top - @HAVE_INTROSPECTION_TRUE@ --include=WebKit-1.0 \ - @HAVE_INTROSPECTION_TRUE@ --program=./epiphany \ - @HAVE_INTROSPECTION_TRUE@ --output $@ \ -+@HAVE_INTROSPECTION_TRUE@ --strip-prefix=Ephy \ - @HAVE_INTROSPECTION_TRUE@ --pkg epiphany-$(EPIPHANY_API_VERSION) \ - @HAVE_INTROSPECTION_TRUE@ -DEPIPHANY_COMPILATION \ - @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir)/embed \ diff --git a/epiphany-mime-scheme-handler.patch b/epiphany-mime-scheme-handler.patch deleted file mode 100644 index 1876019..0000000 --- a/epiphany-mime-scheme-handler.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6375ebd3361a02e6c996140b33979fc1061ef734 Mon Sep 17 00:00:00 2001 -From: Diego Escalante Urrelo -Date: Sun, 10 Oct 2010 19:28:24 -0500 -Subject: [PATCH] epiphany.desktop: declare ability to handle http and https - -Bug #631450 ---- - data/epiphany.desktop.in.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/data/epiphany.desktop.in.in b/data/epiphany.desktop.in.in -index 1c93f4c..fdf5ffe 100644 ---- a/data/epiphany.desktop.in.in -+++ b/data/epiphany.desktop.in.in -@@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Product=epiphany - X-GNOME-Bugzilla-Component=BugBuddyBugs - X-GNOME-Bugzilla-Version=@VERSION@ - Categories=Network;GNOME;GTK;WebBrowser; --MimeType=text/html;text/xml;application/xhtml+xml; -+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https; --- -1.7.1 diff --git a/epiphany.changes b/epiphany.changes index c59c0f1..a5f86f3 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,128 @@ +------------------------------------------------------------------- +Tue Apr 5 16:59:27 UTC 2011 - fcrozat@novell.com + +- Update to version 3.0.0: + + Use the system 'web-browser' high-res icon instead of our own + low-res version. (bgo#645713) + + Use /org/gnome as starting path for schemas. + + Respect our documented special key values for the download dir + (bgo#644641) +- Symlink icons to hicolor to make package check happy. +- Remove post/postun macros for a11y icons, they have been removed. + +------------------------------------------------------------------- +Tue Mar 22 16:47:36 UTC 2011 - fcrozat@novell.com + +- Update to version 2.91.92: + + Fix pages opening in the wrong tab when a session has been + resumed. (bgo#625116) + + Cleanups in autotools setup. (bgo#609498) + + Other bugfixes. +- Changes from version 2.91.91.1: + + bgo#644261: Fix theming issues in the primary toolbar. + + bgo#644247: Remove minimum font size setting from the UI. + + bgo#644521: Use GNOME document font for the default font, + instead of the UI font. + + bgo#644523: Use Serif as default family instead of Sans Serif, + like Every Other Modern Browser Does(tm). +- Changes from version 2.91.91: + + The downloads UI has been totally revamped. It is very similar + to how Chrome works, and should fit much better in the overall + GNOME 3.0 design (bgo#618443). + + Add a border and some padding around the floating statusbar. + + Do a DNS prefetch on the completion items when the cursor is + set over them more than a 1/4th of a second. Should speed-up + page loading. (bgo#606087) + + Other minor bugfixes. + +------------------------------------------------------------------- +Thu Feb 24 10:50:09 UTC 2011 - fcrozat@novell.com + +- Update to version 2.91.90: + + Port statusbar to GeditOverlay; fixes a bunch of bugs and + should be more efficient. + + Group new tabs by default when opened from another page; this + obsoletes the tab-group extension. +- Changes from version 2.91.6: + + Use libsoup's cache implementation instead of WebKit's, which + has been removed now. +- Changes from version 2.91.5: + + Compilation fixes for GTK+ 2.99.0 + + Fix potential dataloss in topic selection dialog (bgo#518727) + + Fix color setting in location bar (bgo#636501) +- Changes from version 2.91.4.1: + + Various compilation fixes +- Changes from version 2.91.4: + + Blacklist Flash plugin, since it will just crash in our + GTK+ 3.x process. + + Use custom (and nicer) error pages (bgo#592667) + + Fix minimum font size setting, add custom setting for font + sizes (bgo#636761) + + Separate migration code into another binary, makes the main + ephy binary not link with NSS (bgo#636685) + + Fix errors properly, particularly do not clobber the global + error state for errors not happening in the main frame + (bgo#623012) +- Changes from version 2.91.3: + + Fix WebKitSoupCache size setup (bgo#635066) + + Fix some leaks in the GObject DOM using code. + + Other small changes. +- Changes from version 2.91.2: + + Get rid of the spinner in the toolbar, port tab spinners to + GtkSpinner (bgo#524809, bgo#598442) + + Enable web inspector unconditionally. + + Use full content zooming by default (bgo#615362). + + Various cleanups and bugfixes. +- Changes from version 2.91.1: + + Port to GSettings (bgo#624485) + + Updated to use GTK+ 3.x (unconditionally) and + gobject-introspection 0.9.5. + + Use the geolocation support in WebKit (bgo#626687) + + A ton of bugfixes. +- Changes from version 2.31.5: + + Show All files in Save dialogs, not only "supported" ones (eg, + HTML). + + Fix epiphany .pc files to have the correct dependencies. +- Changes from version 2.31.4: + + Port to GTK+ 3.x. GTK+ 3.x is now required to build, + 2.x support is dropped. +- Changes from version 2.31.3: + + Remove encoding breaking translations of '...' strings + (bgo#613119) + + Fix URL entry eating up your manually entered URLs in some + cases (#620129) +- Changes from version 2.31.2: + + Use an infobar to inform of session restoration instead of a + modal dialog. + + Show a dialog when F7 is pressed to enable caret browsing + (bgo#501666) + + Use a Chrome-like embedded statusbar and get rid of the + traditional one (bgo#609713) + + Highlight matches when doing "Find again" in search bar + (bgo#611499) + + Refactor load status management in EphyWebView (bgo#593743) + + Open URIs on a new tab when doing middle click in history + items (bgo#611400) + + Re-enable favicons in entry completion (bgo#616345) + + Change sensitiviness of back/forward buttons when clearing + history (bgo#539716) + + Make sure we clear webkit's internal history when clearing the + history in Epiphany (bgo#539716) + + Send 'Referer' on headers sent for context menu HTTP + downloads. (bgo#136292) + + Fix leave-fullscreen button visibility (bgo#611445) +- Drop epiphany-fix-introspection-build.patch and + epiphany-mime-scheme-handler.patch: fixed upstream. +- Remove gconf2-devel BuildRequires and %gconf_schemas_prereq. +- Use %glib2_gsettings_schema_* macros. +- Remove explicit gtk2-devel, libwebkitgtk-devel, libxml2-devel + Requires of devel package: the right ones will be automatically + be added the pkgconfig() way. +- Change BuildRequires: + + libseed-devel to libseed-gtk3-devel. + + libwebkitgtk-devel to libwebkitgtk3-devel. +- Add pkgconfig(gsettings-desktop-schemas) BuildRequires. + ------------------------------------------------------------------- Sun Feb 13 12:18:31 CET 2011 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 69750f4..bc9fb1e 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,7 +1,7 @@ # -# spec file for package epiphany (Version 2.30.6) +# spec file for package epiphany # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -18,8 +18,8 @@ Name: epiphany -Version: 2.30.6 -Release: 4 +Version: 3.0.0 +Release: 1 License: GPLv2+ Summary: GNOME Web Browser Based on the WebKit Rendering Engine Url: http://www.gnome.org/projects/epiphany/ @@ -27,16 +27,11 @@ Group: Productivity/Networking/Web/Browsers Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE epiphany-hide-bookmark-editor.patch vuntz@opensuse.org -- Hide bookmark editors in menu Patch0: epiphany-hide-bookmark-editor.patch -# PATCH-FIX-UPSTREAM epiphany-fix-introspection-build.patch bgo#631119 vuntz@opensuse.org -- Fix build with recent g-i -Patch1: epiphany-fix-introspection-build.patch -# PATCH-FIX-UPSTREAM epiphany-mime-scheme-handler.patch bgo#631450 vuntz@opensuse.org -- Taken from git, register http/https-related mime types -Patch2: epiphany-mime-scheme-handler.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 BuildRequires: NetworkManager-devel BuildRequires: ca-certificates BuildRequires: fdupes -BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-icon-theme BuildRequires: gnome-themes @@ -46,21 +41,22 @@ BuildRequires: iso-codes-devel BuildRequires: libavahi-gobject-devel BuildRequires: libgnome-keyring-devel BuildRequires: libnotify-devel -BuildRequires: libseed-devel +BuildRequires: libseed-gtk3-devel BuildRequires: libsoup-devel -BuildRequires: libwebkitgtk-devel +BuildRequires: libwebkitgtk3-devel BuildRequires: libxslt-devel BuildRequires: mozilla-nss-devel BuildRequires: startup-notification-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gsettings-desktop-schemas) Requires: %{name}-branding Requires: gnome-icon-theme Requires: iso-codes Recommends: %{name}-lang Recommends: ca-certificates BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description Epiphany is a Web browser for the GNOME Desktop. Its principles are @@ -71,9 +67,6 @@ License: GPLv2+ Summary: GNOME Web Browser based on the WebKit Rendering Engine Group: Development/Libraries/GNOME Requires: %{name} = %{version} -Requires: gtk2-devel -Requires: libwebkitgtk-devel -Requires: libxml2-devel Provides: %{name}-doc = %{version} Obsoletes: %{name}-doc < %{version} @@ -100,8 +93,6 @@ This package provides upstream Look and Feel for Epiphany. %setup -q translation-update-upstream %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %patch6 -p1 %build @@ -118,16 +109,10 @@ translation-update-upstream %else --without-ca-file %endif -%__make %{?jobs:-j%jobs} +%__make %{?jobs:-j%jobs} V=1 %install %makeinstall -%if 0%{?suse_version} <= 1110 -%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* -%endif -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif # In case make install did not create the extensions directory; note that we # determine this directory with the pkg-config file that got installed. extensionsdir=`pkg-config --variable extensionsdir %{buildroot}%{_libdir}/pkgconfig/epiphany-*.pc` @@ -135,35 +120,35 @@ if ! test -d %{buildroot}${extensionsdir}; then install -d -m 0755 %{buildroot}${extensionsdir} fi %suse_update_desktop_file -N "Epiphany" %name + +%find_lang %{name} %{?no_lang_C} +for size in 8x8 16x16 22x22 24x24 32x32 48x48 256x256; do + if test -f %{_datadir}/icons/gnome/$size/apps/web-browser.png; then + mkdir -p %{buildroot}%{_datadir}/icons/hicolor/$size/apps + cp -a %{_datadir}/icons/gnome/$size/apps/web-browser.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/web-browser.png + fi +done + %suse_update_desktop_file bme %find_lang %{name} %{?no_lang_C} -%find_gconf_schemas %fdupes %{buildroot} %clean rm -rf %{buildroot} -%pre -f %{name}.schemas_pre - %post /sbin/ldconfig %desktop_database_post %icon_theme_cache_post -%icon_theme_cache_post HighContrastLargePrint -%icon_theme_cache_post HighContrastLargePrintInverse - -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun +%glib2_gsettings_schema_post %postun /sbin/ldconfig %desktop_database_postun %icon_theme_cache_postun -%icon_theme_cache_postun HighContrastLargePrint -%icon_theme_cache_postun HighContrastLargePrintInverse +%glib2_gsettings_schema_postun -%files -f %{name}.schemas_list +%files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %dir %{_datadir}/gnome/ @@ -178,15 +163,13 @@ rm -rf %{buildroot} %{_datadir}/dbus-1/services/org.gnome.Epiphany.service %exclude %{_datadir}/epiphany/default-bookmarks.rdf %{_datadir}/epiphany/ -# When removing the HighContrastLargePrint* icon theme icons, don't forget to remove the %%icon_theme_cache_post(un) call for them -%{_datadir}/icons/HighContrastLargePrint/*/apps/*.png -%{_datadir}/icons/HighContrastLargePrintInverse/*/apps/*.png -# FIXME: gnome-themes does not provide excluded directories yet. -%exclude %{_datadir}/icons/LowContrastLargePrint/*/apps/*.png +%{_datadir}/GConf/gsettings/epiphany.convert +%{_datadir}/glib-2.0/schemas/org.gnome.Epiphany.enums.xml +%{_datadir}/glib-2.0/schemas/org.gnome.epiphany.gschema.xml %{_datadir}/icons/hicolor/*/apps/*.png -%{_datadir}/icons/hicolor/*/apps/*.svg %{_libdir}/epiphany -%{_libdir}/girepository-1.0/Epiphany-2.29.typelib +%{_libdir}/girepository-1.0/Epiphany-3.0.typelib +%{_libdir}/girepository-1.0/EphyEgg-3.0.typelib %doc %{_mandir}/man1/epiphany.1.gz %files lang -f %{name}.lang