diff --git a/20230324.diff b/20230324.diff deleted file mode 100644 index cd1bd87..0000000 --- a/20230324.diff +++ /dev/null @@ -1,104 +0,0 @@ -git diff 20230212..20230324 -w -p -diff --git a/configure.ac b/configure.ac -index 933684ef..d808beaf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2,7 +2,7 @@ AC_PREREQ([2.71]) - - AC_INIT( - [libewf], -- [20230212], -+ [20230324], - [joachim.metz@gmail.com]) - - AC_CONFIG_SRCDIR( -diff --git a/libewf/libewf_libfdata.h b/libewf/libewf_libfdata.h -index 68dd5d19..f7cf74bd 100644 ---- a/libewf/libewf_libfdata.h -+++ b/libewf/libewf_libfdata.h -@@ -34,8 +34,6 @@ - #include - #include - #include --#include --#include - #include - #include - -diff --git a/m4/libfdata.m4 b/m4/libfdata.m4 -index 483cb64f..718b4fbc 100644 ---- a/m4/libfdata.m4 -+++ b/m4/libfdata.m4 -@@ -1,6 +1,6 @@ - dnl Functions for libfdata - dnl --dnl Version: 20201130 -+dnl Version: 20230318 - - dnl Function to detect if libfdata is available - dnl ac_libfdata_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments -@@ -125,9 +125,6 @@ AC_DEFUN([AX_LIBFDATA_CHECK_LIB], - [ac_cv_libfdata_dummy=yes], - [ac_cv_libfdata=no]) - -- dnl Balanced tree functions -- dnl TODO: add functions -- - dnl List functions - AC_CHECK_LIB( - fdata, -diff --git a/m4/libodraw.m4 b/m4/libodraw.m4 -index cdb37cd1..9da9198f 100644 ---- a/m4/libodraw.m4 -+++ b/m4/libodraw.m4 -@@ -1,6 +1,6 @@ - dnl Checks for libodraw required headers and functions - dnl --dnl Version: 20190308 -+dnl Version: 20230218 - - dnl Function to detect if libodraw is available - dnl ac_libodraw_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments -@@ -197,7 +197,7 @@ AC_DEFUN([AX_LIBODRAW_CHECK_LIB], - - dnl Function to detect if libodraw dependencies are available - AC_DEFUN([AX_LIBODRAW_CHECK_LOCAL], -- [AM_PROG_LEX -+ [AC_PROG_LEX(noyywrap) - AC_PROG_YACC - - ac_cv_libodraw_CPPFLAGS="-I../libodraw"; -diff --git a/msvscpp/libfdata/libfdata.vcproj b/msvscpp/libfdata/libfdata.vcproj -index ef9af59c..5ddb62e2 100644 ---- a/msvscpp/libfdata/libfdata.vcproj -+++ b/msvscpp/libfdata/libfdata.vcproj -@@ -198,14 +198,6 @@ - RelativePath="..\..\libfdata\libfdata_support.c" - > - -- -- -- -- - -@@ -288,14 +280,6 @@ - RelativePath="..\..\libfdata\libfdata_support.h" - > - -- -- -- -- - diff --git a/libewf.changes b/libewf.changes index 61364c7..02bf2c8 100644 --- a/libewf.changes +++ b/libewf.changes @@ -4,6 +4,7 @@ Sun Nov 19 10:30:24 UTC 2023 - Jan Engelhardt - Update to release 20231119 * Allow UTF-16 stream unpaired surrogates in ltree * Changed ltree path segment separator +- Delete 20230324.diff (merged) ------------------------------------------------------------------- Tue Aug 1 15:56:21 UTC 2023 - Greg Freemyer diff --git a/libewf.spec b/libewf.spec index 1c6337a..1866ed9 100644 --- a/libewf.spec +++ b/libewf.spec @@ -34,7 +34,6 @@ Source21: Expert_Witness_Compression_Format_EWF.pdf Source23: Expert_Witness_Compression_Format_2_EWF2.pdf Patch1: remove_date_time_macros.patch Patch2: system-libs.patch -Patch3: 20230324.diff BuildRequires: %{python_module devel} BuildRequires: bison BuildRequires: c_compiler