From 75e4cf3e3feb550285b1f2fa892e2f52833dc113876d7577b713452b5cbe84f0 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 2 Aug 2007 22:18:52 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany?expand=0&rev=9 --- 59950.diff | 29 ++++++++++++++--------------- epiphany-2.19.2.tar.bz2 | 3 --- epiphany-2.19.6.tar.bz2 | 3 +++ epiphany.changes | 17 +++++++++++++++++ epiphany.spec | 27 ++++++++++++++++++++++----- 5 files changed, 56 insertions(+), 23 deletions(-) delete mode 100644 epiphany-2.19.2.tar.bz2 create mode 100644 epiphany-2.19.6.tar.bz2 diff --git a/59950.diff b/59950.diff index 3706df1..5dae18e 100644 --- a/59950.diff +++ b/59950.diff @@ -1,29 +1,28 @@ -Index: epiphany-2.18.0/embed/ephy-embed.c +Index: epiphany-2.19.6/embed/ephy-embed.c =================================================================== ---- epiphany-2.18.0.orig/embed/ephy-embed.c -+++ epiphany-2.18.0/embed/ephy-embed.c -@@ -27,6 +27,8 @@ - #include "mozilla-embed-single.h" - #include "mozilla-embed.h" +--- epiphany-2.19.6.orig/embed/ephy-embed.c ++++ epiphany-2.19.6/embed/ephy-embed.c +@@ -25,6 +25,8 @@ + #include "ephy-embed-type-builtins.h" + #include "ephy-marshal.h" +#include + static void ephy_embed_base_init (gpointer g_class); GType -@@ -441,8 +443,16 @@ ephy_embed_load_url (EphyEmbed *embed, +@@ -438,8 +440,15 @@ void + ephy_embed_load_url (EphyEmbed *embed, const char *url) { - /* Remove that crap patch please */ - EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); - iface->load_url (embed, url); -+ /* Sorry, I don't feel like removing this crap patch. */ -+ char *protocol; -+ protocol=malloc(strlen(url)+1); -+ strcpy(protocol,url); -+ protocol=strtok(protocol,":"); -+ if(strcasecmp(protocol,"gopher")!=0) -+ { ++ char *protocol; ++ protocol=malloc(strlen(url)+1); ++ strcpy(protocol,url); ++ protocol=strtok(protocol,":"); ++ if (strcasecmp(protocol,"gopher")!=0) ++ { + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); + iface->load_url (embed, url); + } diff --git a/epiphany-2.19.2.tar.bz2 b/epiphany-2.19.2.tar.bz2 deleted file mode 100644 index 2d9df26..0000000 --- a/epiphany-2.19.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4af43ab688c1fad57e2b54d743422b671d312dfb7b2ebed61bfbef577a0ed2ef -size 4670532 diff --git a/epiphany-2.19.6.tar.bz2 b/epiphany-2.19.6.tar.bz2 new file mode 100644 index 0000000..8fc7594 --- /dev/null +++ b/epiphany-2.19.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aac2c958f7ea4ef995251a29aafd8983890f6c894ededa16154950f07736b46 +size 4712913 diff --git a/epiphany.changes b/epiphany.changes index 5e119b1..33f6a9a 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Aug 2 23:36:39 CEST 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 18:28:02 CEST 2007 - aj@suse.de diff --git a/epiphany.spec b/epiphany.spec index 56bcc4f..f1f4bc1 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany (Version 2.19.2) +# spec file for package epiphany (Version 2.19.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: epiphany %define xulrunner_version 181 -BuildRequires: NetworkManager-devel docbook_4 enchant-devel gcc-c++ gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-icon-theme gnutls-devel gtk-doc iso-codes-devel kdelibs3-devel-doc libglade2-devel libgnomeprintui-devel libwnck-devel libxslt-devel mDNSResponder-devel perl-XML-Parser python-devel python-gnome-devel python-gtk-devel update-desktop-files +BuildRequires: NetworkManager-devel docbook_4 enchant-devel fdupes gcc-c++ gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-icon-theme gnutls-devel gtk-doc iso-codes-devel kdelibs3-devel-doc libglade2-devel libgnomeprintui-devel libwnck-devel libxslt-devel mDNSResponder-devel perl-XML-Parser python-devel python-gnome-devel python-gtk-devel update-desktop-files %if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel %define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner%{xulrunner_version}) @@ -30,8 +30,8 @@ Requires: mozilla = %{mozilla_ver} %endif License: GPL v2 or later Group: Productivity/Networking/Web/Browsers -Version: 2.19.2 -Release: 2 +Version: 2.19.6 +Release: 1 %define interface_version 2.19 Summary: GNOME Web Browser Based on the Mozilla Rendering Engine Source: %{name}-%{version}.tar.bz2 @@ -147,6 +147,8 @@ mkdir $RPM_BUILD_ROOT%{_libdir}/epiphany/%{interface_version}/extensions cat %{name}.lang %{name}.schemas_list >%{name}.lst rm $RPM_BUILD_ROOT%{_libdir}/*/*/*/*.*a +%fdupes $RPM_BUILD_ROOT + %clean rm -rf $RPM_BUILD_ROOT @@ -169,7 +171,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/org.gnome.Epiphany.service %{_datadir}/epiphany -%{_datadir}/icons/hicolor/48x48/apps/epiphany-bookmarks.png +%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/icons/hicolor/*/apps/*.svg %{_datadir}/pixmaps/*.svg %{_datadir}/pygtk/2.0/defs/epiphany.defs %{_datadir}/omf/epiphany @@ -187,6 +190,20 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/epiphany %changelog +* 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