Compare commits

..

No commits in common. "rawhide" and "f39" have entirely different histories.

2 changed files with 9 additions and 75 deletions

View file

@ -1,31 +0,0 @@
--- a/minizip/ioapi_buf.orig.c 2021-05-14 12:57:50.000000000 +0200
+++ b/minizip/ioapi_buf.c 2024-03-17 21:21:15.921141751 +0100
@@ -10,6 +10,12 @@
See the accompanying LICENSE file for the full text of the license.
*/
+#if defined __GNUC__ && __GNUC__ >= 14
+#pragma GCC diagnostic warning "-Wimplicit-function-declaration"
+#pragma GCC diagnostic warning "-Wincompatible-pointer-types"
+#pragma GCC diagnostic warning "-Wint-conversion"
+#pragma GCC diagnostic warning "-Wreturn-mismatch"
+#endif
#include <stdio.h>
#include <stdlib.h>
--- a/minizip/unzip.orig.c 2021-05-14 12:57:50.000000000 +0200
+++ b/minizip/unzip.c 2024-03-17 21:35:00.081438969 +0100
@@ -21,6 +21,13 @@
access functions to crctables and pkeys
*/
+#if defined __GNUC__ && __GNUC__ >= 14
+#pragma GCC diagnostic warning "-Wimplicit-function-declaration"
+#pragma GCC diagnostic warning "-Wincompatible-pointer-types"
+#pragma GCC diagnostic warning "-Wint-conversion"
+#pragma GCC diagnostic warning "-Wreturn-mismatch"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

View file

@ -1,7 +1,7 @@
Name: zipper
Summary: C++ wrapper around minizip compression library
Version: 1.0.3
Release: 14%{?dist}
Release: 6%{?dist}
URL: https://github.com/sebastiandev/zipper
## Source archive from github obtained by
@ -10,17 +10,13 @@ URL: https://github.com/sebastiandev/zipper
## tar -czvf zipper-1.0.3.tar.gz zipper
Source0: https://github.com/sebastiandev/zipper/archive/zipper/%{name}-%{version}.tar.gz
#Patch0: zipper-unbundle_minizip.patch
Patch1: zipper-gcc14.patch
# zlib and GPL+ (no version) licenses come from minizip/ source code
License: MIT AND ZLIB AND GPL-1.0-or-later
License: MIT and zlib and GPL+
BuildRequires: make
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig(zlib)
#BuildRequires: minizip-compat-devel
BuildRequires: make
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: zlib-devel
Provides: bundled(minizip) = 1.1
%description
@ -56,20 +52,14 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
This package provides static library file of %{name}.
%prep
%autosetup -n %{name} -p1
%autosetup -n %{name}
%build
# TODO: remove CMAKE_POLICY_VERSION_MINIMUM if the new upstream source is used
export CMAKE_POLICY_VERSION_MINIMUM=3.5
%cmake -Wno-cpp -Wno-dev \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DBUILD_SHARED_VERSION:BOOL=ON -DBUILD_STATIC_VERSION:BOOL=ON \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \
-DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES -DCMAKE_SKIP_RPATH:BOOL=YES \
-DINSTALL_PKGCONFIG_DIR:PATH=%{_libdir}/pkgconfig \
-DZLIB_INCLUDE_DIR:PATH=%{_includedir} -DZLIB_LIBRARY_RELEASE:FILEPATH=%{_libdir}/libz.so \
%if "%{?_lib}" == "lib64"
%{?_cmake_lib_suffix64}
%endif
-DINSTALL_PKGCONFIG_DIR:PATH=%{_libdir}/pkgconfig
%cmake_build
%install
@ -83,8 +73,7 @@ rm -f %{buildroot}%{_bindir}/Zipper-test
%files
%doc README.md VERSION.txt
%license LICENSE.md
%{_libdir}/*.so.1
%{_libdir}/*.so.1.0.2
%{_libdir}/*.so.*
%files devel
%{_libdir}/*.so
@ -97,30 +86,6 @@ rm -f %{buildroot}%{_bindir}/Zipper-test
%{_libdir}/libZipper-static.a
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Jul 30 2025 Cristian Le <git@lecris.dev> - 1.0.3-12
- Add temporary fix for CMake 4.0 (rhbz#2381650)
* Fri Jul 25 2025 Antonio Trande <sagitter@fedoraproject.org> - 1.0.3-11
- Fix rhbz#2381650 rhbz#2381687
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sun Mar 17 2024 Antonio Trande <sagitter@fedoraproject.org> - 1.0.3-8
- Patched for GCC-14
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild