From 299f7b30678baf7148da0b547791216a9c1d4a19 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Feb 26 2019 09:46:24 +0000
Subject: Merge branch 'f28' into f29


---

diff --git a/.gitignore b/.gitignore
index 2726aa4..3feba89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /Pympler-0.4.3.tar.gz
 /Pympler-0.5.tar.gz
+/Pympler-0.6.tar.gz
diff --git a/python-Pympler-no-shebang.patch b/python-Pympler-no-shebang.patch
index 7e3a11d..0cf3808 100644
--- a/python-Pympler-no-shebang.patch
+++ b/python-Pympler-no-shebang.patch
@@ -1,8 +1,8 @@
-diff -up Pympler-0.4.3/pympler/asizeof.py.no-shebang Pympler-0.4.3/pympler/asizeof.py
---- Pympler-0.4.3/pympler/asizeof.py.no-shebang	2015-12-14 18:05:15.000000000 +0100
-+++ Pympler-0.4.3/pympler/asizeof.py	2016-06-10 12:12:00.931992343 +0200
+diff -up Pympler-0.6/pympler/asizeof.py.no-shebang Pympler-0.6/pympler/asizeof.py
+--- Pympler-0.6/pympler/asizeof.py.no-shebang	2019-02-26 10:41:26.402867320 +0100
++++ Pympler-0.6/pympler/asizeof.py	2019-02-26 10:41:39.852650912 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/env python
  
- # Copyright, license and disclaimer are at the end of this file.
+ # Copyright, license and disclaimer are at the very end of this file.
  
diff --git a/python-Pympler.spec b/python-Pympler.spec
index dc8957e..31b8484 100644
--- a/python-Pympler.spec
+++ b/python-Pympler.spec
@@ -21,8 +21,8 @@ of a Python application and module Class Tracker provides off-line analysis of\
 the lifetime of selected Python objects.
 
 Name: python-%{pname}
-Version: 0.5
-Release: 2%{?dist}
+Version: 0.6
+Release: 1%{?dist}
 Summary: Measure, monitor and analyze the memory behavior of Python objects
 License: ASL 2.0 and BSD and MIT
 # bundled stuff
@@ -52,6 +52,8 @@ Requires: python2-bottle
 Provides: bundled(nodejs-flot-tooltip) = 0.8.4
 # http://omnipotent.net/jquery.sparkline/
 Provides: bundled(nodejs-flot-sparkline) = 2.1.1
+# asizeof.py is bundled
+Provides: bundled(python%{python2_version}dist(asizeof))
 # required by charts.py, but doesn't throw an exception without
 Recommends: python2-matplotlib
 # pympler/panels.py is an extension for django-debug-toolbar
@@ -73,6 +75,8 @@ Requires: python3-bottle
 Provides: bundled(js-jquery-flot-tooltip) = 0.8.4
 # http://omnipotent.net/jquery.sparkline/
 Provides: bundled(js-jquery-sparkline) = 2.1.1
+# asizeof.py is bundled
+Provides: bundled(python%{python3_version}dist(asizeof))
 # required by pympler/charts.py, but doesn't throw an exception without
 Recommends: python3-matplotlib
 # pympler/panels.py is an extension for django-debug-toolbar
@@ -84,6 +88,7 @@ Enhances: python3-django-debug-toolbar
 %prep
 %setup -q -n %{pname}-%{version}
 rm pympler/util/bottle.py
+chmod -x pympler/asizeof.py
 %patch2 -p1 -b .no-shebang
 
 %build
@@ -119,6 +124,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test
 %{python3_sitelib}/pympler
 
 %changelog
+* Tue Feb 26 2019 Dominik Mierzejewski <rpm@greysector.net> 0.6-1
+- update to 0.6
+- mark asizeof.py as bundled (#1649274)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 68f5e05..f3c7972 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Pympler-0.5.tar.gz) = 6fcc2624cec69db11ff12d8ad0113face752a910be18ffe13cc8d68beeeb5223f4515364cb63cbadbcaf1f6e5c6807b262928eae7119cebcba50053ea0b0eb50
+SHA512 (Pympler-0.6.tar.gz) = 262d9452e42366d9a63a857a43969bfaaae2720f1cdd04e7fa2c152bfdd9ae20272d619a6f3964199e5d67446806084d38ec3dea56d2be1af6d3ecd5a3f485dc