Applied updates and changes for deployment

libyal · Nov 19, 2023 · 9035e38 · 9035e38
1 parent 832e019
commit 9035e38
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 632 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -63,10 +63,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

diff --git a/Makefile.am b/Makefile.am
@@ -28,8 +28,6 @@ SUBDIRS = \
 	ewftools \
 	ewf.net \
 	pyewf \
-	pyewf-python2 \
-	pyewf-python3 \
 	po \
 	manuals \
 	tests \

diff --git a/appveyor.yml b/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

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 AC_INIT(
  [libewf],
- [20231119],
+ [20231120],
  [joachim.metz@gmail.com])
 
 AC_CONFIG_SRCDIR(
@@ -161,7 +161,7 @@ dnl Check if libewf Python bindings (pyewf) 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 pyewf/pyewf_error.c
   AC_CHECK_HEADERS([stdarg.h varargs.h])
 
@@ -250,8 +250,6 @@ AC_CONFIG_FILES([libhmac/Makefile])
 AC_CONFIG_FILES([libcaes/Makefile])
 AC_CONFIG_FILES([libewf/Makefile])
 AC_CONFIG_FILES([pyewf/Makefile])
-AC_CONFIG_FILES([pyewf-python2/Makefile])
-AC_CONFIG_FILES([pyewf-python3/Makefile])
 AC_CONFIG_FILES([ewf.net/Makefile])
 AC_CONFIG_FILES([libodraw/Makefile])
 AC_CONFIG_FILES([libsmdev/Makefile])

diff --git a/dpkg/rules b/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:

diff --git a/libewf.spec.in b/libewf.spec.in
@@ -32,7 +32,7 @@ Header files and libraries for developing applications for libewf.
 Summary: Python 3 bindings for libewf
 Group: System Environment/Libraries
 Requires: libewf = %{version}-%{release} python3
-BuildRequires: python3-devel
+BuildRequires: python3-devel python3-setuptools
 
 %description -n libewf-python3
 Python 3 bindings for libewf
@@ -50,7 +50,7 @@ Several tools for reading and writing EWF files
 %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