From 01eccc1af2b87ff06806c45541de1b8b2d414c86546780863a78d7b249598b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aeneas=20Jai=C3=9Fle?= <aj@ajaissle.de>
Date: Mon, 20 Mar 2017 21:09:51 +0000
Subject: [PATCH] Accepting request 460785 from home:totol

OBS-URL: https://build.opensuse.org/request/show/460785
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/prewikka?expand=0&rev=8
---
 prewikka-3.0.0.tar.gz         |  3 ---
 prewikka-3.1.0.tar.gz         |  3 +++
 prewikka-cheetah-shbang.patch | 11 -----------
 prewikka-ez_setup.patch       |  6 ++++++
 prewikka-wsgi-shbang.patch    |  8 --------
 prewikka.changes              |  7 +++++++
 prewikka.spec                 | 17 ++++++-----------
 7 files changed, 22 insertions(+), 33 deletions(-)
 delete mode 100644 prewikka-3.0.0.tar.gz
 create mode 100644 prewikka-3.1.0.tar.gz
 delete mode 100644 prewikka-cheetah-shbang.patch
 delete mode 100644 prewikka-wsgi-shbang.patch

diff --git a/prewikka-3.0.0.tar.gz b/prewikka-3.0.0.tar.gz
deleted file mode 100644
index 9c0a929..0000000
--- a/prewikka-3.0.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe32c83c6d159c9a724656ea5d15808cfbf7b6398886f736d0ed723fcdbdfe8f
-size 1333924
diff --git a/prewikka-3.1.0.tar.gz b/prewikka-3.1.0.tar.gz
new file mode 100644
index 0000000..fe9eedf
--- /dev/null
+++ b/prewikka-3.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7e27fe9ef2acb0df7e28586e675e9a783a13f3f7b762eb0350f835366200649
+size 1349193
diff --git a/prewikka-cheetah-shbang.patch b/prewikka-cheetah-shbang.patch
deleted file mode 100644
index 8cf3ed1..0000000
--- a/prewikka-cheetah-shbang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py	2016-04-26 12:10:01.792592253 +0200
-+++ setup.py.new	2016-04-26 12:09:53.444776966 +0200
-@@ -53,7 +53,7 @@
- 
- def template_compile(input, output_dir):
-     from Cheetah.CheetahWrapper import CheetahWrapper
--    CheetahWrapper().main([ sys.argv[0], "compile", "--nobackup", input ])
-+    CheetahWrapper().main([ sys.argv[0], "compile", "--nobackup", "--shbang", "''", input ])
- 
- 
- class my_build_py(build_py):
diff --git a/prewikka-ez_setup.patch b/prewikka-ez_setup.patch
index 0bf907c..4db66c7 100644
--- a/prewikka-ez_setup.patch
+++ b/prewikka-ez_setup.patch
@@ -1,3 +1,9 @@
+From: Thomas Andrejak <thomas.andrejak@gmail.com>
+Date: 2017-02-27 23:25:00 +0100
+References: no
+Upstream: no
+Subject: Backport ez_setup to be compatible with old (Open)SuSE
+
 --- ez_setup.py	2016-04-22 23:28:03.000000000 +0200
 +++ ez_setup.py	2016-05-02 00:23:50.498917032 +0200
 @@ -36,7 +36,7 @@
diff --git a/prewikka-wsgi-shbang.patch b/prewikka-wsgi-shbang.patch
deleted file mode 100644
index 400a139..0000000
--- a/prewikka-wsgi-shbang.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- scripts/prewikka.wsgi	2016-04-22 23:28:03.000000000 +0200
-+++ scripts/prewikka.wsgi.new	2016-04-26 12:20:55.621987856 +0200
-@@ -1,2 +1,4 @@
-+#!/usr/bin/env python
-+
- from prewikka.web import wsgi
- application = wsgi.application
-\ No newline at end of file
diff --git a/prewikka.changes b/prewikka.changes
index 1bad2fb..f294ce8 100644
--- a/prewikka.changes
+++ b/prewikka.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 10 00:33:55 UTC 2017 - thomas.andrejak@gmail.com
+
+- Update to 3.1.0 (Prelude 3.1.0 released on 14 Sept 2016)
+- Remove unnecessary patches
+- Spec-Cleaner
+
 -------------------------------------------------------------------
 Thu Jan 26 21:28:03 UTC 2017 - jengelh@inai.de
 
diff --git a/prewikka.spec b/prewikka.spec
index 29d8059..5bed566 100644
--- a/prewikka.spec
+++ b/prewikka.spec
@@ -17,16 +17,15 @@
 
 
 Name:           prewikka
-Version:        3.0.0
+Version:        3.1.0
 Release:        0
 Summary:        Graphical front-end analysis console for the Prelude Framework
 License:        GPL-2.0+
 Group:          Productivity/Networking/Web/Frontends
 Url:            https://www.prelude-siem.org
-Source0:        https://www.prelude-siem.org/pkg/src/3.0.0/%{name}-%{version}.tar.gz
-Patch0:         prewikka-cheetah-shbang.patch
-Patch1:         prewikka-wsgi-shbang.patch
-Patch2:         prewikka-ez_setup.patch
+Source0:        https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
+# Backport ez_setup to be compatible with old (Open)SuSE
+Patch0:         prewikka-ez_setup.patch
 BuildRequires:  gettext
 BuildRequires:  python-cheetah
 BuildRequires:  python-devel
@@ -49,14 +48,10 @@ well as access to external tools such as whois and traceroute.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-
-%build
+%patch0
 
 %install
-%{__python} setup.py install -O1 --root=%{buildroot}
+python setup.py install -O1 --root=%{buildroot}
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 mkdir -p %{buildroot}%{_sbindir}/
 mv %{buildroot}/%{_bindir}/%{name}-httpd %{buildroot}/%{_sbindir}/%{name}-httpd