From b5fc40881bf17238ac3cee48440fb06b9be901f57a8e280e9f22e371ae0c6344 Mon Sep 17 00:00:00 2001
From: Greg Freemyer <Greg.Freemyer@gmail.com>
Date: Tue, 28 Jan 2020 22:09:41 +0000
Subject: [PATCH] Accepting request 768051 from
 home:mcepl:branches:security:forensics

- Update to 20200121
- Remove include-examples-in-packages.patch as it is included
  upstream.

OBS-URL: https://build.opensuse.org/request/show/768051
OBS-URL: https://build.opensuse.org/package/show/security:forensics/python-dfVFS?expand=0&rev=28
---
 dfvfs-20200117.tar.gz              |  3 ---
 dfvfs-20200121.tar.gz              |  3 +++
 include-examples-in-packages.patch | 11 -----------
 python-dfVFS-rpmlintrc             |  1 +
 python-dfVFS.changes               |  7 +++++++
 python-dfVFS.spec                  | 10 +++++-----
 6 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 100644 dfvfs-20200117.tar.gz
 create mode 100644 dfvfs-20200121.tar.gz
 delete mode 100644 include-examples-in-packages.patch
 create mode 100644 python-dfVFS-rpmlintrc

diff --git a/dfvfs-20200117.tar.gz b/dfvfs-20200117.tar.gz
deleted file mode 100644
index bf58a78..0000000
--- a/dfvfs-20200117.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b526c7973962f41d836dc21716988d4d4137739b04a6f27bbf242bae67ba628d
-size 78161450
diff --git a/dfvfs-20200121.tar.gz b/dfvfs-20200121.tar.gz
new file mode 100644
index 0000000..cbdca5a
--- /dev/null
+++ b/dfvfs-20200121.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:33abd173cee972c6da784ba018b24080c03c2ed9bc96429cdd4ba231fccdc16b
+size 78161691
diff --git a/include-examples-in-packages.patch b/include-examples-in-packages.patch
deleted file mode 100644
index d4d58e2..0000000
--- a/include-examples-in-packages.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dfvfs-20200117/setup.py	2020-01-19 07:00:47.000000000 -0500
-+++ dfvfs-20200117-2/setup.py	2020-01-12 03:04:01.000000000 -0500
-@@ -187,7 +187,7 @@
-         'Programming Language :: Python',
-     ],
-     packages=find_packages('.', exclude=[
--        'examples', 'tests', 'tests.*', 'utils']),
-+        'tests', 'tests.*', 'utils']),
-     package_dir={
-         'dfvfs': 'dfvfs'
-     },
diff --git a/python-dfVFS-rpmlintrc b/python-dfVFS-rpmlintrc
new file mode 100644
index 0000000..6e8eff3
--- /dev/null
+++ b/python-dfVFS-rpmlintrc
@@ -0,0 +1 @@
+addFilter("non-executable-script .*/dfvfs/examples/.*")
diff --git a/python-dfVFS.changes b/python-dfVFS.changes
index 0e91c50..e364406 100644
--- a/python-dfVFS.changes
+++ b/python-dfVFS.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 24 16:16:47 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Update to 20200121
+- Remove include-examples-in-packages.patch as it is included
+  upstream.
+
 -------------------------------------------------------------------
 Sat Jan 18 17:44:38 CET 2020 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-dfVFS.spec b/python-dfVFS.spec
index 61a2153..9c3ecdc 100644
--- a/python-dfVFS.spec
+++ b/python-dfVFS.spec
@@ -17,7 +17,7 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define timestamp 20200117
+%define timestamp 20200121
 %define skip_python2 1
 Name:           python-dfVFS
 Version:        0~%{timestamp}
@@ -26,8 +26,8 @@ Summary:        Digital Forensics Virtual File System
 License:        Apache-2.0
 Group:          Productivity/File utilities
 URL:            https://github.com/log2timeline/dfvfs/wiki
-Source:         https://github.com/log2timeline/dfvfs/releases/download/%{timestamp}/dfvfs-%{timestamp}.tar.gz
-Patch0:         include-examples-in-packages.patch
+Source0:        https://github.com/log2timeline/dfvfs/releases/download/%{timestamp}/dfvfs-%{timestamp}.tar.gz
+Source99:       python-dfVFS-rpmlintrc
 BuildRequires:  %{python_module PyYAML}
 BuildRequires:  %{python_module cffi}
 BuildRequires:  %{python_module cryptography}
@@ -93,7 +93,8 @@ dfVFS is currently implemented as a Python module.
 
 %prep
 %setup -q -n dfvfs-%{timestamp}
-%patch0 -p 1
+%autopatch -p1
+
 find dfvfs -name \*.py | xargs sed -i "/#!\/usr\/bin\/python/d"
 chmod -x utils/check_dependencies.py
 chmod -x run_tests.py
@@ -110,7 +111,6 @@ chmod -x run_tests.py
 %check
 # Using pytest leads to some horribly-looking crashes, not sure what's
 # going on.
-# /bin/true because of gh#log2timeline/dfvfs#421
 %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
 $python ./run_tests.py
 }