diff --git a/libolecf-alpha-20181231.tar.gz b/libolecf-alpha-20181231.tar.gz deleted file mode 100644 index 6d1ef97..0000000 --- a/libolecf-alpha-20181231.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0f2c0d37addeacc47bc2ce09cf6f72d568bf3f62c775590661f2cd2a2b804f1 -size 1568926 diff --git a/libolecf-alpha-20191221.tar.gz b/libolecf-alpha-20191221.tar.gz new file mode 100644 index 0000000..538be2d --- /dev/null +++ b/libolecf-alpha-20191221.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4207b4962ce1556519a9bcb44529c605eda5ec4dbced3f53e0421ed46a5457b9 +size 1588002 diff --git a/libolecf.changes b/libolecf.changes index 99ad598..0ab5c14 100644 --- a/libolecf.changes +++ b/libolecf.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Apr 8 22:06:27 UTC 2020 - Greg Freemyer + +- update to 20191221 + * changes for libcdata + * Worked on mount tool +- rename python-libolecf to python2-libolecf +- add python3-libolecf subproject +- use libfdatetime, libfvalue, libcerror, libcsystem from factory instead of internal version + ------------------------------------------------------------------- Mon Apr 1 21:46:17 UTC 2019 - Greg Freemyer diff --git a/libolecf.spec b/libolecf.spec index 7ea0e41..6ecafb9 100644 --- a/libolecf.spec +++ b/libolecf.spec @@ -1,7 +1,7 @@ # # spec file for package libolecf # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,36 +18,32 @@ Name: libolecf %define lname libolecf1 -%define timestamp 20181231 +%define timestamp 20191221 Version: 0~%timestamp Release: 0 Summary: Library and tools to access the OLE 2 Compound File (OLECF) format License: LGPL-3.0-or-later AND GFDL-1.3-or-later Group: Productivity/File utilities -Url: https://github.com/libyal/libolecf/wiki +URL: https://github.com/libyal/libolecf/wiki Source: https://github.com/libyal/libolecf/releases/download/%timestamp/%name-alpha-%timestamp.tar.gz Source2: OLE_Compound_File_format.pdf BuildRequires: pkg-config -BuildRequires: python-devel BuildRequires: pkgconfig(libbfio) BuildRequires: pkgconfig(libcdata) >= 20190112 +BuildRequires: pkgconfig(libcerror) > 20160327 BuildRequires: pkgconfig(libcfile) BuildRequires: pkgconfig(libclocale) BuildRequires: pkgconfig(libcnotify) BuildRequires: pkgconfig(libcpath) BuildRequires: pkgconfig(libcsplit) -# BuildRequires: pkgconfig(libcsystem) >= 20120425 +BuildRequires: pkgconfig(libcstring) >= 20150101 BuildRequires: pkgconfig(libcthreads) >= 20130723 +BuildRequires: pkgconfig(libfdatetime) >= 20180910 BuildRequires: pkgconfig(libfguid) >= 20140103 BuildRequires: pkgconfig(libfole) >= 20120426 +BuildRequires: pkgconfig(libfvalue) > 20151226 BuildRequires: pkgconfig(libuna) -# testing fails with external package from factory - verified Jan 27, 2016 -#BuildRequires: pkgconfig(libfdatetime) > 20150507 -#BuildRequires: pkgconfig(libcstring) > 20150101 -#BuildRequires: pkgconfig(libfvalue) > 20151226 -# build fails with external package from factory - verified Jul 12, 2016 -#BuildRequires: pkgconfig(libcerror) > 20160327 # released, but not yet packaged. This is the only user in OBS. #BuildRequires: pkgconfig(libwfps) > 20150104 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -86,15 +82,26 @@ libolecf is a library to access the OLE 2 Compound File (OLECF) format. This subpackage contains libraries and header files for developing applications that want to make use of %name. -%package -n python-%name +%package -n python2-%{name} Summary: Python bindings for libolecf License: LGPL-3.0-or-later Group: Development/Libraries/Python Requires: %lname = %version -Requires: python -Provides: pyolecf = %version +BuildRequires: pkgconfig(python2) +Obsoletes: pyolecf = 20191221 +Obsoletes: python-%{name} = 20191221 -%description -n python-%name +%description -n python2-%name +Python bindings for libolecf, which can read MS IE cache files. + +%package -n python3-%{name} +Summary: Python bindings for libolecf +License: LGPL-3.0-or-later +Group: Development/Libraries/Python +Requires: %lname = %version +BuildRequires: pkgconfig(python3) + +%description -n python3-%name Python bindings for libolecf, which can read MS IE cache files. %prep @@ -102,7 +109,7 @@ Python bindings for libolecf, which can read MS IE cache files. cp "%SOURCE2" . %build -%configure --disable-static --enable-wide-character-type --enable-python +%configure --disable-static --enable-wide-character-type --enable-python2 --enable-python3 make %{?_smp_mflags} %install @@ -132,10 +139,16 @@ find %buildroot -name '*.la' -delete %_libdir/pkgconfig/libolecf.pc %_mandir/man3/libolecf.3* -%files -n python-%name +%files -n python2-%name %defattr(-,root,root) %doc AUTHORS README %license COPYING -%python_sitearch/pyolecf.so +%python2_sitearch/pyolecf.so + +%files -n python3-%name +%defattr(-,root,root) +%doc AUTHORS README +%license COPYING +%python3_sitearch/pyolecf.so %changelog