From a3117975c21b892a87cf7e2f2be653e5c64ea8b54c58e26f82d750d61da0c1cf Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Fri, 9 Jan 2015 23:38:20 +0000 Subject: [PATCH 1/4] Accepting request 280653 from home:gregfreemyer:Tools-for-forensic-boot-cd update as part of libyal 2015 refresh OBS-URL: https://build.opensuse.org/request/show/280653 OBS-URL: https://build.opensuse.org/package/show/security:forensics/python-dfVFS?expand=0&rev=4 --- dfvfs-20141220.tar.gz | 3 --- dfvfs-20150108.tar.gz | 3 +++ python-dfVFS.changes | 7 +++++++ python-dfVFS.spec | 10 +++++++--- 4 files changed, 17 insertions(+), 6 deletions(-) delete mode 100644 dfvfs-20141220.tar.gz create mode 100644 dfvfs-20150108.tar.gz diff --git a/dfvfs-20141220.tar.gz b/dfvfs-20141220.tar.gz deleted file mode 100644 index 13fed4f..0000000 --- a/dfvfs-20141220.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1c0675d17fcf2786e16710881e5f57d6e7e4cbf9a1eb73ffd6c020e7b556c7c -size 62428793 diff --git a/dfvfs-20150108.tar.gz b/dfvfs-20150108.tar.gz new file mode 100644 index 0000000..4b2e0f7 --- /dev/null +++ b/dfvfs-20150108.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fb8cad99195aa23190fc585bf41623700ad1c8bd0d5b8adac4b81e903e775ac +size 62429013 diff --git a/python-dfVFS.changes b/python-dfVFS.changes index dc47f2c..923a32a 100644 --- a/python-dfVFS.changes +++ b/python-dfVFS.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 9 21:54:16 UTC 2015 - Greg.Freemyer@gmail.com + +- update to v0~20150108 + * bugfix for auto-dependency build +- add explicit "%py_compile ." to resolve rpmlint complaint about datestamps not matching + ------------------------------------------------------------------- Mon Dec 22 22:59:29 UTC 2014 - Greg.Freemyer@gmail.com diff --git a/python-dfVFS.spec b/python-dfVFS.spec index 848b889..5cffbdf 100644 --- a/python-dfVFS.spec +++ b/python-dfVFS.spec @@ -1,7 +1,7 @@ # # spec file for package python-dfVFS # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define timestamp 20141220 +%define timestamp 20150108 Name: python-dfVFS Version: 0~%{timestamp} Release: 0 @@ -24,7 +24,7 @@ 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/20141220/dfvfs-20141220.tar.gz +Source: https://github.com/log2timeline/dfvfs/releases/download/%timestamp/dfvfs-%timestamp.tar.gz BuildRequires: fdupes BuildRequires: pkg-config BuildRequires: python-devel @@ -61,6 +61,10 @@ python setup.py build %install python setup.py install --root=%{buildroot} --prefix=%{_prefix} +# force complie to resolve an rpmlint complaint +pushd %{buildroot}%{python_sitelib}/dfvfs/ +%py_compile . +popd %fdupes -s %{buildroot} %files From 72bb2843404e7d5365567f0bb915f4fd058211ebfd1ce878fe11071454c19857 Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Wed, 21 Jan 2015 20:31:39 +0000 Subject: [PATCH 2/4] Accepting request 282265 from home:gregfreemyer:Tools-for-forensic-boot-cd Add examples and run_tests.py to the %doc folder OBS-URL: https://build.opensuse.org/request/show/282265 OBS-URL: https://build.opensuse.org/package/show/security:forensics/python-dfVFS?expand=0&rev=5 --- python-dfVFS.changes | 6 ++++++ python-dfVFS.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/python-dfVFS.changes b/python-dfVFS.changes index 923a32a..7a68242 100644 --- a/python-dfVFS.changes +++ b/python-dfVFS.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 21 15:22:54 UTC 2015 - Greg.Freemyer@gmail.com + +- add the examples folder to the %doc section of %files +- add run_tests.py to the %doc section of %files + ------------------------------------------------------------------- Fri Jan 9 21:54:16 UTC 2015 - Greg.Freemyer@gmail.com diff --git a/python-dfVFS.spec b/python-dfVFS.spec index 5cffbdf..fb8fbf3 100644 --- a/python-dfVFS.spec +++ b/python-dfVFS.spec @@ -61,6 +61,9 @@ python setup.py build %install python setup.py install --root=%{buildroot} --prefix=%{_prefix} +# examples should not be installed +# see https://github.com/log2timeline/dfvfs/issues/4 +rm -rf %{buildroot}/%{python_sitelib}/examples # force complie to resolve an rpmlint complaint pushd %{buildroot}%{python_sitelib}/dfvfs/ %py_compile . @@ -71,8 +74,9 @@ popd %defattr(-,root,root) %doc ACKNOWLEDGEMENTS AUTHORS LICENSE %doc utils/check_dependencies.py +%doc run_tests.py +%doc examples %{python_sitelib}/dfvfs-%{timestamp}-py2.7.egg-info %{python_sitelib}/dfvfs -%exclude %{python_sitelib}/examples %changelog From 63603d8dd84f63556e5d627effb22444bc1bd7f778770767f3589dd56810c7ed Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Thu, 22 Jan 2015 23:16:45 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/security:forensics/python-dfVFS?expand=0&rev=6 --- python-dfVFS.changes | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/python-dfVFS.changes b/python-dfVFS.changes index 7a68242..4052741 100644 --- a/python-dfVFS.changes +++ b/python-dfVFS.changes @@ -1,15 +1,11 @@ ------------------------------------------------------------------- Wed Jan 21 15:22:54 UTC 2015 - Greg.Freemyer@gmail.com -- add the examples folder to the %doc section of %files -- add run_tests.py to the %doc section of %files - -------------------------------------------------------------------- -Fri Jan 9 21:54:16 UTC 2015 - Greg.Freemyer@gmail.com - - update to v0~20150108 * bugfix for auto-dependency build - add explicit "%py_compile ." to resolve rpmlint complaint about datestamps not matching +- add the examples folder to the %doc section of %files +- add run_tests.py to the %doc section of %files ------------------------------------------------------------------- Mon Dec 22 22:59:29 UTC 2014 - Greg.Freemyer@gmail.com From 7dfa53668556224b762f5afbdec4055c9dd717a47ab59807b18edc56ea2f712b Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Wed, 25 Mar 2015 22:33:01 +0000 Subject: [PATCH 4/4] Accepting request 293183 from home:gregfreemyer:Tools-for-forensic-boot-cd OBS-URL: https://build.opensuse.org/request/show/293183 OBS-URL: https://build.opensuse.org/package/show/security:forensics/python-dfVFS?expand=0&rev=7 --- dfvfs-20150108.tar.gz | 3 --- dfvfs-20150303.tar.gz | 3 +++ python-dfVFS.changes | 11 +++++++++++ python-dfVFS.spec | 13 +++++++------ 4 files changed, 21 insertions(+), 9 deletions(-) delete mode 100644 dfvfs-20150108.tar.gz create mode 100644 dfvfs-20150303.tar.gz diff --git a/dfvfs-20150108.tar.gz b/dfvfs-20150108.tar.gz deleted file mode 100644 index 4b2e0f7..0000000 --- a/dfvfs-20150108.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fb8cad99195aa23190fc585bf41623700ad1c8bd0d5b8adac4b81e903e775ac -size 62429013 diff --git a/dfvfs-20150303.tar.gz b/dfvfs-20150303.tar.gz new file mode 100644 index 0000000..aaa6cbe --- /dev/null +++ b/dfvfs-20150303.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42596221c9110ffcbedf97e39ed0f6af35a95701976bb6b44b594c11978de99a +size 62435458 diff --git a/python-dfVFS.changes b/python-dfVFS.changes index 4052741..ddc9c55 100644 --- a/python-dfVFS.changes +++ b/python-dfVFS.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Mar 25 14:59:26 UTC 2015 - Greg.Freemyer@gmail.com + +- update to v0~20150303 + * dfVFS is in a rapid state of development and Changelog entries have not been implemented by upstream +- add Requires: pysigscan, it is a new dependency +- add a new %exclude in %files due to doubly included %doc files +- remove spec file entry deleting installed examples. Resolved upstream. + * see https://github.com/log2timeline/dfvfs/issues/4 +- chmod run_tests.py to remove the executable bits. Was causing a rmplint warning. + ------------------------------------------------------------------- Wed Jan 21 15:22:54 UTC 2015 - Greg.Freemyer@gmail.com diff --git a/python-dfVFS.spec b/python-dfVFS.spec index fb8fbf3..3634121 100644 --- a/python-dfVFS.spec +++ b/python-dfVFS.spec @@ -1,7 +1,7 @@ # # spec file for package python-dfVFS # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define timestamp 20150108 +%define timestamp 20150303 Name: python-dfVFS Version: 0~%{timestamp} Release: 0 @@ -32,6 +32,7 @@ BuildRequires: python-setuptools Requires: pybde Requires: pyewf Requires: pyqcow +Requires: pysigscan Requires: pysmdev Requires: pysmraw Requires: python-construct @@ -55,15 +56,13 @@ dfVFS is currently implemented as a Python module. %setup -q -n dfvfs-%{timestamp} find dfvfs -name \*.py | xargs sed -i "/#!\/usr\/bin\/python/d" chmod -x utils/check_dependencies.py +chmod -x run_tests.py %build python setup.py build %install python setup.py install --root=%{buildroot} --prefix=%{_prefix} -# examples should not be installed -# see https://github.com/log2timeline/dfvfs/issues/4 -rm -rf %{buildroot}/%{python_sitelib}/examples # force complie to resolve an rpmlint complaint pushd %{buildroot}%{python_sitelib}/dfvfs/ %py_compile . @@ -72,11 +71,13 @@ popd %files %defattr(-,root,root) -%doc ACKNOWLEDGEMENTS AUTHORS LICENSE +%doc ACKNOWLEDGEMENTS AUTHORS LICENSE README %doc utils/check_dependencies.py %doc run_tests.py %doc examples %{python_sitelib}/dfvfs-%{timestamp}-py2.7.egg-info %{python_sitelib}/dfvfs +# these are installed into the wrong place +%exclude %{_datadir}/doc/dfvfs/ %changelog