From a44724fa000c98bf7c34898f73eafa41292ad38c Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: May 17 2012 14:00:36 +0000 Subject: Fix URLs --- diff --git a/yawn-0-urls.patch b/yawn-0-urls.patch new file mode 100644 index 0000000..9a0b101 --- /dev/null +++ b/yawn-0-urls.patch @@ -0,0 +1,11 @@ +diff -up ./yawn.py.orig ./yawn.py +--- ./yawn.py.orig 2012-05-17 15:54:35.430476551 +0200 ++++ ./yawn.py 2012-05-17 15:55:07.804231442 +0200 +@@ -2074,6 +2074,7 @@ def _baseScript(req): + # req object doesn't seem to have this!! + # TODO make this more robust + # http://www.modpython.org/pipermail/mod_python/2006-March/020501.html ++ return "." + drlen = len(req.subprocess_env['DOCUMENT_ROOT']) + if os.path.basename(__file__)[:6] == 'index.': + return os.path.dirname(__file__)[drlen:] diff --git a/yawn.spec b/yawn.spec index 1743c5f..1bf8aa0 100644 --- a/yawn.spec +++ b/yawn.spec @@ -5,7 +5,7 @@ Name: yawn Version: 0 -Release: 0.3.20120227svn%{svnrev}%{?dist} +Release: 0.4.20120227svn%{svnrev}%{?dist} Summary: Yet Another WBEM Navigator @@ -19,6 +19,8 @@ Source0: yawn.py # Patch0: resolves bz#802683, reported upstream (see link in bz) Patch0: yawn-0-content-type.patch +# Patch1: fixes URLs +Patch1: yawn-0-urls.patch BuildRequires: httpd Requires: mod_python, pywbem, httpd @@ -30,6 +32,7 @@ Web-based CIM/WBEM browser %prep cp %{SOURCE0} . %patch0 -p1 -b .content-type +%patch1 -p1 -b .urls %build @@ -68,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{apacheconfdir}/conf.d/yawn.conf %changelog +* Thu May 17 2012 Vitezslav Crhonek - 0-0.4.20120227svn561 +- Fix URLs (patch by Radek Novacek, rnovacek@redhat.com) + * Tue Mar 13 2012 Vitezslav Crhonek - 0-0.3.20120227svn561 - Fix Pickle method sets Content-type: text/plain instead of text/html (patch by Jan Safranek, jsafrane@redhat.com)