From 8264974028660686f47eff54ef19ea5633671e15f00cd0d58b1b8bef9b064b71 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 14 Jun 2010 10:58:55 +0000 Subject: [PATCH 1/5] Accepting request 41432 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/epiphany via accept of submit request 41432 revision 3. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/41432 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=71 --- epiphany-hide-bookmark-editor.patch | 9 +++++++++ epiphany.changes | 7 +++++++ epiphany.spec | 5 ++++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 epiphany-hide-bookmark-editor.patch diff --git a/epiphany-hide-bookmark-editor.patch b/epiphany-hide-bookmark-editor.patch new file mode 100644 index 0000000..7c003e5 --- /dev/null +++ b/epiphany-hide-bookmark-editor.patch @@ -0,0 +1,9 @@ +Index: epiphany-2.30.2/data/bme.desktop.in.in +=================================================================== +--- epiphany-2.30.2.orig/data/bme.desktop.in.in ++++ epiphany-2.30.2/data/bme.desktop.in.in +@@ -12,3 +12,4 @@ X-GNOME-Bugzilla-Product=epiphany + X-GNOME-Bugzilla-Component=BugBuddyBugs + X-GNOME-Bugzilla-Version=@VERSION@ + Categories=Network;GNOME;GTK; ++NoDisplay=true diff --git a/epiphany.changes b/epiphany.changes index 036d747..8de43db 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 14 11:43:54 CEST 2010 - vuntz@opensuse.org + +- Add epiphany-hide-bookmark-editor.patch to hide bme.desktop in + the menus. +- Do not add a System category to bme.desktop. + ------------------------------------------------------------------- Thu Jun 3 19:00:25 CEST 2010 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 56563c8..c54044a 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -25,6 +25,8 @@ Summary: GNOME Web Browser Based on the WebKit Rendering Engine Url: http://www.gnome.org/projects/epiphany/ 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-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 @@ -111,6 +113,7 @@ This package provides upstream Look and Feel for Epiphany. %prep %setup -q translation-update-upstream +%patch0 -p1 %patch6 -p1 %build @@ -143,7 +146,7 @@ if ! test -d %{buildroot}${extensionsdir}; then install -d -m 0755 %{buildroot}${extensionsdir} fi %suse_update_desktop_file -N "Epiphany" %name -%suse_update_desktop_file bme System +%suse_update_desktop_file bme %find_lang %{name} %find_gconf_schemas %fdupes %{buildroot} From 5132375c9493d5e4d22b962b59f75534b1cf21d8c19d58e6bc99e79849eb36bf Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 21 Jun 2010 16:13:54 +0000 Subject: [PATCH 2/5] Accepting request 41690 from GNOME:Factory checked in (request 41690) OBS-URL: https://build.opensuse.org/request/show/41690 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=72 --- epiphany-hide-bookmark-editor.patch | 9 --------- epiphany.changes | 7 ------- epiphany.spec | 5 +---- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 epiphany-hide-bookmark-editor.patch diff --git a/epiphany-hide-bookmark-editor.patch b/epiphany-hide-bookmark-editor.patch deleted file mode 100644 index 7c003e5..0000000 --- a/epiphany-hide-bookmark-editor.patch +++ /dev/null @@ -1,9 +0,0 @@ -Index: epiphany-2.30.2/data/bme.desktop.in.in -=================================================================== ---- epiphany-2.30.2.orig/data/bme.desktop.in.in -+++ epiphany-2.30.2/data/bme.desktop.in.in -@@ -12,3 +12,4 @@ X-GNOME-Bugzilla-Product=epiphany - X-GNOME-Bugzilla-Component=BugBuddyBugs - X-GNOME-Bugzilla-Version=@VERSION@ - Categories=Network;GNOME;GTK; -+NoDisplay=true diff --git a/epiphany.changes b/epiphany.changes index 8de43db..036d747 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Mon Jun 14 11:43:54 CEST 2010 - vuntz@opensuse.org - -- Add epiphany-hide-bookmark-editor.patch to hide bme.desktop in - the menus. -- Do not add a System category to bme.desktop. - ------------------------------------------------------------------- Thu Jun 3 19:00:25 CEST 2010 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index c54044a..56563c8 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -25,8 +25,6 @@ Summary: GNOME Web Browser Based on the WebKit Rendering Engine Url: http://www.gnome.org/projects/epiphany/ 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-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 @@ -113,7 +111,6 @@ This package provides upstream Look and Feel for Epiphany. %prep %setup -q translation-update-upstream -%patch0 -p1 %patch6 -p1 %build @@ -146,7 +143,7 @@ if ! test -d %{buildroot}${extensionsdir}; then install -d -m 0755 %{buildroot}${extensionsdir} fi %suse_update_desktop_file -N "Epiphany" %name -%suse_update_desktop_file bme +%suse_update_desktop_file bme System %find_lang %{name} %find_gconf_schemas %fdupes %{buildroot} From 28c4b2da6f3b29ca0020fc53ae5a827f63f3be876db9000a88712dcaf1a781d5 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 7 Aug 2010 12:42:14 +0000 Subject: [PATCH 3/5] Accepting request 44836 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/epiphany via accept of submit request 44836 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44836 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=73 --- epiphany-hide-bookmark-editor.patch | 9 +++++++++ epiphany.changes | 13 +++++++++++++ epiphany.spec | 11 +++++++---- 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 epiphany-hide-bookmark-editor.patch diff --git a/epiphany-hide-bookmark-editor.patch b/epiphany-hide-bookmark-editor.patch new file mode 100644 index 0000000..7c003e5 --- /dev/null +++ b/epiphany-hide-bookmark-editor.patch @@ -0,0 +1,9 @@ +Index: epiphany-2.30.2/data/bme.desktop.in.in +=================================================================== +--- epiphany-2.30.2.orig/data/bme.desktop.in.in ++++ epiphany-2.30.2/data/bme.desktop.in.in +@@ -12,3 +12,4 @@ X-GNOME-Bugzilla-Product=epiphany + X-GNOME-Bugzilla-Component=BugBuddyBugs + X-GNOME-Bugzilla-Version=@VERSION@ + Categories=Network;GNOME;GTK; ++NoDisplay=true diff --git a/epiphany.changes b/epiphany.changes index 036d747..5dc7013 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Aug 7 12:18:27 CEST 2010 - vuntz@opensuse.org + +- Change libwebkit-devel BuildRequires (and Requires of devel + package) to libwebkitgtk-devel, since this package got renamed. + +------------------------------------------------------------------- +Mon Jun 14 11:43:54 CEST 2010 - vuntz@opensuse.org + +- Add epiphany-hide-bookmark-editor.patch to hide bme.desktop in + the menus. +- Do not add a System category to bme.desktop. + ------------------------------------------------------------------- Thu Jun 3 19:00:25 CEST 2010 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 56563c8..9dad052 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -19,12 +19,14 @@ Name: epiphany Version: 2.30.2 -Release: 2 +Release: 3 License: GPLv2+ Summary: GNOME Web Browser Based on the WebKit Rendering Engine Url: http://www.gnome.org/projects/epiphany/ 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-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 @@ -46,7 +48,7 @@ BuildRequires: libgnome-keyring-devel BuildRequires: libnotify-devel BuildRequires: libseed-devel BuildRequires: libsoup-devel -BuildRequires: libwebkit-devel +BuildRequires: libwebkitgtk-devel BuildRequires: libxslt-devel %if 0%{suse_version} > 1110 BuildRequires: lsb-release @@ -74,7 +76,7 @@ Summary: GNOME Web Browser based on the WebKit Rendering Engine Group: Development/Libraries/GNOME Requires: %{name} = %{version} Requires: gtk2-devel -Requires: libwebkit-devel +Requires: libwebkitgtk-devel Requires: libxml2-devel %description devel @@ -111,6 +113,7 @@ This package provides upstream Look and Feel for Epiphany. %prep %setup -q translation-update-upstream +%patch0 -p1 %patch6 -p1 %build @@ -143,7 +146,7 @@ if ! test -d %{buildroot}${extensionsdir}; then install -d -m 0755 %{buildroot}${extensionsdir} fi %suse_update_desktop_file -N "Epiphany" %name -%suse_update_desktop_file bme System +%suse_update_desktop_file bme %find_lang %{name} %find_gconf_schemas %fdupes %{buildroot} From 51bdf1331b746b12f77daba705b83ce4072d8e53ace8e8ef8c60378063dbcdd5 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 9 Aug 2010 21:53:52 +0000 Subject: [PATCH 4/5] Accepting request 45040 from GNOME:Factory checked in (request 45040) OBS-URL: https://build.opensuse.org/request/show/45040 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=74 --- epiphany.changes | 6 ------ epiphany.spec | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/epiphany.changes b/epiphany.changes index 5dc7013..8de43db 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Sat Aug 7 12:18:27 CEST 2010 - vuntz@opensuse.org - -- Change libwebkit-devel BuildRequires (and Requires of devel - package) to libwebkitgtk-devel, since this package got renamed. - ------------------------------------------------------------------- Mon Jun 14 11:43:54 CEST 2010 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 9dad052..fe954df 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -48,7 +48,7 @@ BuildRequires: libgnome-keyring-devel BuildRequires: libnotify-devel BuildRequires: libseed-devel BuildRequires: libsoup-devel -BuildRequires: libwebkitgtk-devel +BuildRequires: libwebkit-devel BuildRequires: libxslt-devel %if 0%{suse_version} > 1110 BuildRequires: lsb-release @@ -76,7 +76,7 @@ Summary: GNOME Web Browser based on the WebKit Rendering Engine Group: Development/Libraries/GNOME Requires: %{name} = %{version} Requires: gtk2-devel -Requires: libwebkitgtk-devel +Requires: libwebkit-devel Requires: libxml2-devel %description devel From fbde65ad30dd23420e8a9a7f1568f0f55cba973973d30a2594feb8144b19b803 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 9 Aug 2010 21:53:53 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/epiphany revision 63.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=253207eb0da93e944d740fae88fe4b8a --- epiphany.changes | 6 ++++++ epiphany.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/epiphany.changes b/epiphany.changes index 8de43db..5dc7013 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Aug 7 12:18:27 CEST 2010 - vuntz@opensuse.org + +- Change libwebkit-devel BuildRequires (and Requires of devel + package) to libwebkitgtk-devel, since this package got renamed. + ------------------------------------------------------------------- Mon Jun 14 11:43:54 CEST 2010 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index fe954df..e43e327 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -19,7 +19,7 @@ Name: epiphany Version: 2.30.2 -Release: 3 +Release: 6 License: GPLv2+ Summary: GNOME Web Browser Based on the WebKit Rendering Engine Url: http://www.gnome.org/projects/epiphany/ @@ -48,7 +48,7 @@ BuildRequires: libgnome-keyring-devel BuildRequires: libnotify-devel BuildRequires: libseed-devel BuildRequires: libsoup-devel -BuildRequires: libwebkit-devel +BuildRequires: libwebkitgtk-devel BuildRequires: libxslt-devel %if 0%{suse_version} > 1110 BuildRequires: lsb-release @@ -76,7 +76,7 @@ Summary: GNOME Web Browser based on the WebKit Rendering Engine Group: Development/Libraries/GNOME Requires: %{name} = %{version} Requires: gtk2-devel -Requires: libwebkit-devel +Requires: libwebkitgtk-devel Requires: libxml2-devel %description devel