Compare commits

...
Sign in to create a new pull request.

16 commits

Author SHA1 Message Date
Jakub Sencak
a9eea40832 Replaced make macros with cmake macros
- the %cmake macro defaults to ninja generator instead of make
- removed obsolete files.
- added CMake files to devel.
Assisted-by: Sonnet 4.5
2026-07-22 07:49:18 +02:00
Fedora Release Engineering
19ff1f90e5 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:45:13 +00:00
Fedora Release Engineering
d03f4d156a Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 21:12:32 +00:00
Cristian Le
95093d8460 Allow to build with CMake 4.0 (rhbz#2381654) 2025-11-12 18:02:25 +01:00
Fedora Release Engineering
796ae21d86 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 21:22:27 +00:00
Jakub Martisko
d0bf72c8e4 Rebase to zziplib-0.13.78 2025-01-22 15:30:16 +01:00
Fedora Release Engineering
5452bf6e70 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 16:55:40 +00:00
Fedora Release Engineering
8f12ede02e Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 10:59:48 +00:00
Jakub Martisko
9766ac2cc1 Rebase to 0.13.74 2024-04-04 12:10:39 +02:00
Yaakov Selkowitz
5e3e24b6fb Workaround GCC 14 strictness
Discussion is ongoing upstream on how to fix various incompatible types
issues, but no fix has been agreed upon yet:

https://bugzilla.redhat.com/show_bug.cgi?id=2256917
2024-02-11 15:27:01 -05:00
Fedora Release Engineering
40e2e7cd84 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 11:22:03 +00:00
Fedora Release Engineering
820f1b5c11 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 19:49:34 +00:00
David Cantrell
6b1fb9e7a1 Update License tag to SPDX identifiers
Examined the source code and updated the License tag to an SPDX
expression representing this project.  The author offers the source
under either LGPL-2.0-or-later or MPL-1.1.

Signed-off-by: David Cantrell <dcantrell@redhat.com>
2023-05-17 11:51:15 -04:00
Fedora Release Engineering
41f2bfec63 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 08:23:04 +00:00
Fedora Release Engineering
07b676070a Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 14:02:32 +00:00
Alexander Bokovoy
79ad2633a3 Package 0.13.72
- Fixes CVE-2020-18442
- Resolves: rhbz#1973831
- Switch build to CMake, drop 32-bit patches as checks integrated in CMake already

Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
2022-02-09 19:04:27 +02:00
6 changed files with 68 additions and 104 deletions

4
.gitignore vendored
View file

@ -6,3 +6,7 @@ zziplib-0.13.49.tar.bz2
/v0.13.68.tar.gz
/v0.13.69.tar.gz
/v0.13.71.tar.gz
/v0.13.72.tar.gz
/v0.13.74.tar.gz
/zziplib-0.13.78.tar.gz
/v0.13.78.tar.gz

View file

@ -1,29 +0,0 @@
--- ./a/zzip/_config.h 2021-07-21 14:18:09.000000000 +0200
+++ ./b/zzip/_config.h 2021-07-21 14:46:24.037432969 +0200
@@ -138,9 +138,12 @@
/* whether the system defaults to 32bit off_t but can do 64bit when requested
*/
+#if __WORDSIZE == 32
#ifndef ZZIP_LARGEFILE_SENSITIVE
#define ZZIP_LARGEFILE_SENSITIVE 1
#endif
+#endif
+/* #undef LARGEFILE_SENSITIVE */
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#ifndef ZZIP_LT_OBJDIR
@@ -227,9 +230,13 @@
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
+#if __WORDSIZE == 32
#ifndef ZZIP__FILE_OFFSET_BITS
#define ZZIP__FILE_OFFSET_BITS 64
#endif
+#endif
+/* #undef _FILE_OFFSET_BITS */
+
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */

View file

@ -1,29 +0,0 @@
--- ./a/zzip/_config.h 2021-07-21 14:18:14.000000000 +0200
+++ ./b/zzip/_config.h 2021-07-21 14:46:24.037432969 +0200
@@ -138,6 +138,11 @@
/* whether the system defaults to 32bit off_t but can do 64bit when requested
*/
+#if __WORDSIZE == 32
+#ifndef ZZIP_LARGEFILE_SENSITIVE
+#define ZZIP_LARGEFILE_SENSITIVE 1
+#endif
+#endif
/* #undef LARGEFILE_SENSITIVE */
/* Define to the sub-directory where libtool stores uninstalled libraries. */
@@ -225,8 +230,14 @@
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
+#if __WORDSIZE == 32
+#ifndef ZZIP__FILE_OFFSET_BITS
+#define ZZIP__FILE_OFFSET_BITS 64
+#endif
+#endif
/* #undef _FILE_OFFSET_BITS */
+
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */

View file

@ -1,11 +0,0 @@
--- a/configure
+++ b/configure
@@ -19143,7 +19143,7 @@ Name: @PACKAGE_NAME@
Description: @PACKAGE_DESCRIPTION@
Version: @PACKAGE_VERSION@
Requires: @PACKAGE_REQUIRES@
-Libs: -L\${libdir} @LDFLAGS@ @LIBS@
+Libs: -L\${libdir} @LIBS@
Cflags: -I\${includedir} @CPPFLAGS@
AXEOF
fi # DONE generate $pkgconfig_generate.in

View file

@ -1 +1 @@
SHA512 (v0.13.71.tar.gz) = e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
SHA512 (v0.13.78.tar.gz) = e96771c310a1a9eb227027e8c2a495409c01dd273b483b3a04119d6a273cce7c88ba77c192fcde5e85d0a37c847a0df8e521f460d00920e62153400f0743ea78

View file

@ -1,15 +1,14 @@
# FTBFS with GCC 14, reported upstream, no fix yet
# https://bugzilla.redhat.com/show_bug.cgi?id=2256917
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.71
Release: 7%{?dist}
License: LGPLv2+ or MPLv1.1
Version: 0.13.78
Release: 6%{?dist}
License: LGPL-2.0-or-later OR MPL-1.1
URL: http://zziplib.sourceforge.net/
Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz
Patch1: remove_ldflags_pkconfig_files.patch
Patch100: multilib-32.patch
Patch101: multilib-64.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: perl-interpreter
@ -20,8 +19,7 @@ BuildRequires: xmlto
BuildRequires: zlib-devel
BuildRequires: SDL-devel
BuildRequires: pkgconfig
#BuildRequires: autoconf
#BuildRequires: automake
BuildRequires: cmake
%description
The zziplib library is intentionally lightweight, it offers the ability to
@ -62,35 +60,16 @@ zziplib library.
%prep
%setup -q
%patch1 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure \
--disable-static \
--enable-sdl \
--enable-frame-pointer
# Remove rpath on 64bit archs
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
# Only patch generated _config.h on non-i686 and armv7hl
# These platforms have a correct _config.h already
pushd %{_builddir}/zziplib-%{version}
%ifarch i686 armv7hl
patch -p2 < %{PATCH100}
%else
patch -p2 < %{PATCH101}
%endif
popd
%make_build
# TODO: Please submit an issue to upstream (rhbz#2381654)
export CMAKE_POLICY_VERSION_MINIMUM=3.5
%cmake
%cmake_build
%install
%make_install
%cmake_install
%ldconfig_scriptlets
@ -104,13 +83,63 @@ popd
%files devel
%doc docs/README.SDL docs/*.htm
%{_includedir}/*
%exclude %{_libdir}/*.la
%{_libdir}/cmake/zziplib/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/aclocal/*.m4
%{_mandir}/man3/*
%changelog
* Tue Jul 22 2026 Jakub Sencak <jsencak@redhat.com> - 0.13.78-6
- Replaced make macros with cmake macros; the cmake macro defaults to ninja generator instead of make
- Removed obsolete files
- Ship CMake config files in -devel package
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.78-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.78-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Tue Nov 11 2025 Cristian Le <git@lecris.dev> - 0.13.78-3
- Allow to build with CMake 4.0 (rhbz#2381654)
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.78-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Wed Jan 22 2025 Jakub Martisko <jamartis@redhat.com> - 0.13.78-1
- Rebase to 0.13.78
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.74-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.74-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Apr 04 2024 Jakub Martisko <jamartis@redhat.com> - 0.13.74-1
- Rebase to 0.13.74
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.72-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.72-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed May 17 2023 David Cantrell <dcantrell@redhat.com> - 0.13.72-4
- Update License tag to SPDX identifiers
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.72-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.72-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Feb 09 2022 Alexander Bokovoy <abokovoy@redhat.com> - 0.13.72-1
- 0.13.72
- Fixes CVE-2020-18442
- Resolves: rhbz#1973831
- Switch build to CMake, drop 32-bit patches as checks integrated in CMake already
* Sat Feb 05 2022 Leigh Scott <leigh123linux@gmail.com> - 0.13.71-7
- Fix pkgconfig files