[midori] - Add docdir patch again, problem was not fixed properly upstream
Christoph Wickert
cwickert at fedoraproject.org
Sat Jan 8 19:33:18 UTC 2011
commit aef7accb2a88c81c5a8768f0ca7a72f217926b52
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sat Jan 8 20:33:06 2011 +0100
- Add docdir patch again, problem was not fixed properly upstream
midori-0.2.4-docdir.patch | 47 ---------------------------------------------
midori-0.2.9-docdir.patch | 16 +++++++++++++++
midori.spec | 13 ++++++++++-
3 files changed, 27 insertions(+), 49 deletions(-)
---
diff --git a/midori-0.2.9-docdir.patch b/midori-0.2.9-docdir.patch
new file mode 100644
index 0000000..2b69e10
--- /dev/null
+++ b/midori-0.2.9-docdir.patch
@@ -0,0 +1,16 @@
+--- midori-browser.c 2010-10-31 23:20:48.000000000 +0100
++++ midori-0.2.9/midori/midori-browser.c 2011-01-08 12:51:47.249181998 +0100
+@@ -4526,10 +4526,10 @@
+ }
+ #else
+ #ifdef DOCDIR
+- uri = "file://" DOCDIR "/midori/user/midori.html";
+- if (g_access (DOCDIR "/midori/user/midori.html", F_OK) != 0)
++ uri = "file://" DOCDIR "/user/midori.html";
++ if (g_access (DOCDIR "/user/midori.html", F_OK) != 0)
+ #endif
+- uri = "error:nodocs " DOCDIR "/midori/user/midori.html";
++ uri = "error:nodocs " DOCDIR "/user/midori.html";
+ #endif
+ }
+ else if (!strncmp ("HelpFAQ", action_name, 7))
diff --git a/midori.spec b/midori.spec
index 5d7375d..222cf11 100644
--- a/midori.spec
+++ b/midori.spec
@@ -1,6 +1,6 @@
Name: midori
Version: 0.2.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A lightweight GTK+ web browser
Group: Applications/Internet
@@ -13,6 +13,9 @@ Source0: http://archive.xfce.org/src/apps/%{name}/0.2/%{name}-%{version}.tar.bz2
## instead of Google.
Patch0: %{name}-fedora-homepage.patch
Patch1: midori-0.2.9-libnotify.patch
+# FIXME: Remove this patch in 0.2.10 because is has recently been fixed in git
+# Upstream bug: http://www.twotoasts.de/bugs/index.php?do=details&task_id=1007
+Patch2: midori-0.2.9-docdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,7 +70,10 @@ developing extensions for %{name}.
## Use the system-provided waf, instead of the in-tarball copy.
#rm -rf waf
%patch0 -b .fedora-homepage
-%patch1 -p1 -b .libnotify
+%if 0%{?fedora} >= 15
+%patch1 -p1 -b .libnotify-0.7.0
+%endif
+%patch2 -p1 -b .docdir
%build
export CFLAGS="%{optflags}"
@@ -139,6 +145,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sat Jan 08 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.9-3
+- Add docdir patch again, problem was not fixed properly upstream
+
* Fri Nov 05 2010 Kevin Fenzi <kevin at tummy.com> - 0.2.9-2
- Add patch for new libnotify
More information about the scm-commits
mailing list