Compare commits

..

No commits in common. "7293c0702c261fdef4a06f2cbe213e8a94b4af2a" and "656e76519e42e8044058c11950260e54160fcccc" have entirely different histories.

4 changed files with 9 additions and 37 deletions

View File

@ -1,19 +0,0 @@
diff --git a/ewftools/ewfoutput.c b/ewftools/ewfoutput.c
index 80ae16a..1d2c97f 100644
--- a/ewftools/ewfoutput.c
+++ b/ewftools/ewfoutput.c
@@ -197,9 +197,13 @@ void ewfoutput_version_detailed_fprint(
fprintf(
stream,
" (libcrypto %s)",
+#if defined ( OPENSSL_FULL_VERSION_STR )
+ OPENSSL_FULL_VERSION_STR );
+#else
SHLIB_VERSION_NUMBER );
#endif
#endif
+#endif
#if defined( HAVE_LIBODRAW ) || defined( HAVE_LOCAL_LIBODRAW )
fprintf(

View File

@ -1,12 +1,12 @@
Name: libewf Name: libewf
Version: 20140608 Version: 20140608
Release: 16 Release: 13
Summary: Library to access the Expert Witness Compression Format (EWF) Summary: Library to access the Expert Witness Compression Format (EWF)
License: LGPLv3+ License: LGPLv3+
URL: http://sourceforge.net/projects/libewf/ URL: http://sourceforge.net/projects/libewf/
Source0: https://github.com/ArchAssault-Project/libewf/archive/v.20140608.tar.gz #Source0 url: https://github.com/ArchAssault-Project/libewf/archive/v.20140608.tar.gz
Patch0: libewf-ewfoutput-openssl3.patch Source0: %{name}-%{version}.tar.gz
BuildRequires: gcc-c++ fuse-devel libuuid-devel openssl-devel zlib-devel BuildRequires: gcc-c++ fuse-devel libuuid-devel openssl-devel zlib-devel python2-devel
%description %description
Libewf is a library for support of the Expert Witness Compression Format (EWF), Libewf is a library for support of the Expert Witness Compression Format (EWF),
@ -16,7 +16,7 @@ libewf allows to read files created by EnCase 1 to 6, linen and FTK Imager.
%package -n ewftools %package -n ewftools
Summary: Tools for the Expert Witness Compression Format (EWF) Summary: Tools for the Expert Witness Compression Format (EWF)
Requires: libewf = %{version}-%{release} Requires: libewf = %{version}-%{release} python2-fuse >= 0.2
Provides: libewf-tools = %{version}-%{release} Provides: libewf-tools = %{version}-%{release}
Obsoletes: libewf-tools <= %{version}-%{release} Obsoletes: libewf-tools <= %{version}-%{release}
@ -43,7 +43,7 @@ This package contains man manual for help.
%autosetup -n libewf-v.20140608 -p1 %autosetup -n libewf-v.20140608 -p1
%build %build
%configure --disable-static --enable-wide-character-type \ %configure --disable-static --enable-wide-character-type --enable-python \
CFLAGS="${RPM_OPT_FLAGS} -std=gnu89" CFLAGS="${RPM_OPT_FLAGS} -std=gnu89"
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -68,6 +68,7 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
%files -n ewftools %files -n ewftools
%{_bindir}/ewf* %{_bindir}/ewf*
%{python2_sitearch}/pyewf.so
%files devel %files devel
%{_includedir}/{libewf.h,libewf/} %{_includedir}/{libewf.h,libewf/}
@ -79,14 +80,5 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
%{_mandir}/man3/*.gz %{_mandir}/man3/*.gz
%changelog %changelog
* Fri Feb 3 2023 caodongxia <caodongxia@h-partners.com> - 20140608-16
- Fix ewfoutput to compile with openssl-3.x
* Mon Oct 26 2020 leiju <leiju4@huawei.com> - 20140608-15
- Remove BuildRequires python2-devel and Requires python2-fuse
* Wed Sep 2 2020 zhangtao <zhangtao221@huawei.com> - 20140608-14
- Modify the Source0 Url
* Tue Feb 25 2020 Tianfei <tianfei16@huawei.com> - 20140608-13 * Tue Feb 25 2020 Tianfei <tianfei16@huawei.com> - 20140608-13
- Package init - Package init

View File

@ -1,5 +1,4 @@
git_url: https://github.com/ArchAssault-Project/libewf.git
version_control: github version_control: github
src_repo: ArchAssault-Project/libewf src_repo: ArchAssault-Project/libewf
tag_prefix: "v." tag_pattern: ^v
seperator: "." seperator: .