[packages/graphite-web] Killing use of internal thirdparty modules.

[matkor]

commit a7529da1581be3dc79ea4820f995bf701c7a9b72
Author: Mateusz Korniak <matkor at pld-linux.org>
Date:   Fri Nov 27 15:02:30 2015 +0100

    Killing use of internal thirdparty modules.

 graphite-web-kill-thirdparty-modules.patch | 19 +++++++++++++++++++
 graphite-web.spec                          |  9 ++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)
---
diff --git a/graphite-web.spec b/graphite-web.spec
index 6b516b1..22e14df 100644
--- a/graphite-web.spec
+++ b/graphite-web.spec
@@ -7,7 +7,8 @@ Group:		Applications/WWW
 Source0:	https://codeload.github.com/graphite-project/%{name}/tar.gz/%{version}
 Source1:	apache.conf
 Source2:	%{name}.logrotate
-Patch0:		config.patch
+Patch0:		%{name}-kill-thirdparty-modules.patch
+
 URL:		https://launchpad.net/graphite/
 BuildRequires:	rpm-pythonprov
 # for the py_build, py_install macros
@@ -46,10 +47,8 @@ and enterprise scalability.
 
 %prep
 %setup -q
-# Patch for Filesystem Hierarchy Standard
-# Remove thridparty libs
-# https://github.com/hggh/graphite-web-upstream/commit/47361a2707f904a8b817ca96deeddabcdbaaa534.patch
-# %patch0 -p1
+# Kill strict use of thidparty subdir copies of python modules
+%patch0 -p1
 
 %build
 %py_build %{?with_tests:test}  
diff --git a/graphite-web-kill-thirdparty-modules.patch b/graphite-web-kill-thirdparty-modules.patch
new file mode 100644
index 0000000..1ab2b94
--- /dev/null
+++ b/graphite-web-kill-thirdparty-modules.patch
@@ -0,0 +1,19 @@
+--- graphite-web-0.9.14/webapp/graphite/cli/parser.py.kill-thirdparty-modules	2015-11-27 14:50:24.160441928 +0100
++++ graphite-web-0.9.14/webapp/graphite/cli/parser.py	2015-11-27 14:50:52.621908582 +0100
+@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ See the License for the specific language governing permissions and
+ limitations under the License."""
+ 
+-from graphite.thirdparty.pyparsing import *
++from pyparsing import *
+ 
+ grammar = Forward()
+ 
+--- graphite-web-0.9.14/webapp/graphite/render/grammar.py.kill-thirdparty-modules	2015-11-27 14:46:01.016881826 +0100
++++ graphite-web-0.9.14/webapp/graphite/render/grammar.py	2015-11-27 14:46:17.001038841 +0100
+@@ -1,4 +1,4 @@
+-from graphite.thirdparty.pyparsing import *
++from pyparsing import *
+ 
+ ParserElement.enablePackrat()
+ grammar = Forward()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/graphite-web.git/commitdiff/4b0a7e4cfc8105a46c2ff4a3f10faeeb793bb7d0