diff --git a/minizip-2.8.3_lib_prefix.patch b/minizip-2.8.3_lib_prefix.patch new file mode 100644 index 0000000..f20b492 --- /dev/null +++ b/minizip-2.8.3_lib_prefix.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d070550..a191805 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -599,7 +599,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES + VERSION ${VERSION} + SOVERSION ${SOVERSION} + LINKER_LANGUAGE C +- PREFIX "" ++ PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX} + DEFINE_SYMBOL "MZ_EXPORTS" + POSITION_INDEPENDENT_CODE 1) + if(MZ_LZMA) +@@ -804,4 +804,4 @@ if(MZ_BUILD_FUZZ_TEST) + install(TARGETS zip_fuzzer RUNTIME DESTINATION "bin") + install(TARGETS unzip_fuzzer RUNTIME DESTINATION "bin") + endif() +-endif() ++endif() +\ No newline at end of file diff --git a/minizip.spec b/minizip.spec index ed15ef0..b3d67bf 100644 --- a/minizip.spec +++ b/minizip.spec @@ -1,12 +1,14 @@ Name: minizip Version: 2.8.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Minizip contrib in zlib with the latest bug fixes and advanced features License: zlib URL: https://github.com/nmoinvaz/%{name} Source0: https://github.com/nmoinvaz/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: minizip-2.8.3_lib_prefix.patch + BuildRequires: cmake gcc-c++ libbsd-devel zlib-devel bzip2-devel Provides: bundled(aes-gladman) Provides: bundled(sha1-gladman) @@ -56,11 +58,11 @@ make test %exclude %{_libdir}/debug/usr/bin/%{name}-%{version}-%{release}.%{_arch}.debug %license LICENSE %doc README.md -%{_libdir}/%{name}.so.* +%{_libdir}/lib%{name}.so.* %files devel -%{_libdir}/%{name}.so +%{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/cmake/%{name} %{_includedir}/mz*.h @@ -68,6 +70,9 @@ make test %{_includedir}/zip.h %changelog +* Wed Feb 13 2019 Patrik Novotný 2.8.3-4 +- Fix shared library prefix + * Tue Feb 12 2019 Patrik Novotný 2.8.3-3 - Fix ldconfig execution during build