Applied updates and changes for deployment

.github/workflows/build.yml

@@ -54,10 +54,6 @@ jobs:
           compiler: 'gcc'
           configure_options: '--enable-python'
           python_version: ''
-        - architecture: 'x64'
-          compiler: 'gcc'
-          configure_options: '--enable-python3'
-          python_version: '3'
     steps:
     - uses: actions/checkout@v3
     - name: Install build dependencies

.gitignore

@@ -1,6 +1,6 @@
 # Files to ignore by git
 #
-# Version: 20230926
+# Version: 20231119
 
 # Generic auto-generated build files
 *~
@@ -127,7 +127,6 @@ stamp-h[1-9]
 /libpff.spec
 /libpff/libpff.rc
 /libpff/libpff_definitions.h
-/pypff-python[23]/*.[ch]
 /setup.cfg
 /jpff/classnoinst.stamp
 /pfftools/*.exe

Makefile.am

@@ -24,8 +24,6 @@ SUBDIRS = \
 	pfftools \
 	jpff \
 	pypff \
-	pypff-python2 \
-	pypff-python3 \
 	po \
 	manuals \
 	tests \
@@ -53,6 +51,9 @@ PKGCONFIG_FILES = \
 	libpff.pc.in
 
 SETUP_PY_FILES = \
+	pyproject.toml \
+	setup.cfg \
+	setup.cfg.in \
 	setup.py
 
 SPEC_FILES = \

README

@@ -27,7 +27,7 @@ Additional features:
 Also see:
 
 * PFF forensics - analyzing the horrible reference file format: https://github.com/libyal/documentation/blob/master/PFF%20Forensics%20-%20analyzing%20the%20horrible%20reference%20file%20format.pdf
-* PFF forensics - e-mail and appoinment falsification analysis: https://github.com/libyal/documentation/blob/master/PFF%20forensics%20-%20e-mail%20and%20appoinment%20falsification%20analysis.pdf
+* PFF forensics - e-mail and appointment falsification analysis: https://github.com/libyal/documentation/blob/master/PFF%20forensics%20-%20e-mail%20and%20appoinment%20falsification%20analysis.pdf
 * MAPI definitions: https://github.com/libyal/libfmapi/blob/master/documentation/MAPI%20definitions.pdf
 
 Planned:

appveyor.yml

@@ -168,11 +168,6 @@ environment:
     BUILD_ENVIRONMENT: cygwin64
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     CONFIGURE_OPTIONS: "--enable-python"
-  - TARGET: cygwin64-gcc-python3
-    BUILD_ENVIRONMENT: cygwin64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-    CONFIGURE_OPTIONS: "--enable-python3"
-    PYTHON_VERSION: 3
   - TARGET: cygwin64-gcc-static-executables
     BUILD_ENVIRONMENT: cygwin64
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 AC_INIT(
  [libpff],
- [20231118],
+ [20231205],
  [[email protected]])
 
 AC_CONFIG_SRCDIR(
@@ -129,7 +129,7 @@ dnl Check if libpff Python bindings (pypff) required headers and functions are a
 AX_PYTHON_CHECK_ENABLE
 
 AS_IF(
-  [test "x${ac_cv_enable_python}" != xno || test "x${ac_cv_enable_python2}" != xno || test "x${ac_cv_enable_python3}" != xno],
+  [test "x${ac_cv_enable_python}" != xno],
   [dnl Headers included in pypff/pypff_error.c
   AC_CHECK_HEADERS([stdarg.h varargs.h])
 
@@ -198,8 +198,6 @@ AC_CONFIG_FILES([libfwnt/Makefile])
 AC_CONFIG_FILES([libfmapi/Makefile])
 AC_CONFIG_FILES([libpff/Makefile])
 AC_CONFIG_FILES([pypff/Makefile])
-AC_CONFIG_FILES([pypff-python2/Makefile])
-AC_CONFIG_FILES([pypff-python3/Makefile])
 AC_CONFIG_FILES([jpff/Makefile])
 AC_CONFIG_FILES([pfftools/Makefile])
 AC_CONFIG_FILES([po/Makefile.in])

dpkg/rules

@@ -11,7 +11,7 @@ export SKIP_PYTHON_TESTS=1
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-python3 CFLAGS="-g"
+	dh_auto_configure -- --enable-python CFLAGS="-g"
 
 .PHONY: override_dh_install
 override_dh_install:

libpff.spec.in

@@ -32,7 +32,7 @@ Header files and libraries for developing applications for libpff.
 Summary: Python 3 bindings for libpff
 Group: System Environment/Libraries
 Requires: libpff = %{version}-%{release} python3
-BuildRequires: python3-devel
+BuildRequires: python3-devel python3-setuptools
 
 %description -n libpff-python3
 Python 3 bindings for libpff
@@ -49,7 +49,7 @@ Several tools for reading Personal Folder Files (OST, PAB and PST)
 %setup -q
 
 %build
-%configure --prefix=/usr --libdir=%{_libdir} --mandir=%{_mandir} --enable-python3
+%configure --prefix=/usr --libdir=%{_libdir} --mandir=%{_mandir} --enable-python
 make %{?_smp_mflags}
 
 %install