Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
2ccdbe84a1 |
4 changed files with 60 additions and 92 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -6,7 +6,3 @@ 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
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (v0.13.78.tar.gz) = e96771c310a1a9eb227027e8c2a495409c01dd273b483b3a04119d6a273cce7c88ba77c192fcde5e85d0a37c847a0df8e521f460d00920e62153400f0743ea78
|
||||
SHA512 (v0.13.71.tar.gz) = e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
|
||||
|
|
|
|||
31
zziplib-0.13.69-multilib.patch
Normal file
31
zziplib-0.13.69-multilib.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
diff -up ./_builddir/zzip/_config.h.orig ./_builddir/zzip/_config.h
|
||||
--- ./_builddir/zzip/_config.h.orig 2018-07-23 09:11:59.971840954 +0300
|
||||
+++ ./_builddir/zzip/_config.h 2018-07-23 09:12:07.438731527 +0300
|
||||
@@ -139,6 +139,11 @@
|
||||
/* whether the system defaults to 32bit off_t but can do 64bit when requested
|
||||
*/
|
||||
/* #undef LARGEFILE_SENSITIVE */
|
||||
+#if __WORDSIZE == 32
|
||||
+#ifndef ZZIP_LARGEFILE_SENSITIVE
|
||||
+#define ZZIP_LARGEFILE_SENSITIVE 1
|
||||
+#endif
|
||||
+#endif
|
||||
|
||||
/* Define to the sub-directory where libtool stores uninstalled libraries. */
|
||||
#ifndef ZZIP_LT_OBJDIR
|
||||
@@ -197,6 +202,15 @@
|
||||
/* The number of bytes in type short */
|
||||
/* #undef SIZEOF_SHORT */
|
||||
|
||||
+/* The number of bytes in type long */
|
||||
+#ifndef ZZIP_SIZEOF_LONG
|
||||
+#if __WORDSIZE == 32
|
||||
+#define ZZIP_SIZEOF_LONG 4
|
||||
+#elif __WORDSIZE == 64
|
||||
+#define ZZIP_SIZEOF_LONG 8
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#ifndef ZZIP_STDC_HEADERS
|
||||
#define ZZIP_STDC_HEADERS 1
|
||||
117
zziplib.spec
117
zziplib.spec
|
|
@ -1,25 +1,24 @@
|
|||
# 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.78
|
||||
Release: 6%{?dist}
|
||||
License: LGPL-2.0-or-later OR MPL-1.1
|
||||
Version: 0.13.71
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+ or MPLv1.1
|
||||
URL: http://zziplib.sourceforge.net/
|
||||
Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz
|
||||
Patch0: zziplib-0.13.69-multilib.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: python3
|
||||
BuildRequires: python3-rpm-macros
|
||||
BuildRequires: python
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: zip
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: SDL-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: cmake
|
||||
#BuildRequires: autoconf
|
||||
#BuildRequires: automake
|
||||
|
||||
%description
|
||||
The zziplib library is intentionally lightweight, it offers the ability to
|
||||
|
|
@ -61,15 +60,28 @@ zziplib library.
|
|||
%prep
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
# TODO: Please submit an issue to upstream (rhbz#2381654)
|
||||
export CMAKE_POLICY_VERSION_MINIMUM=3.5
|
||||
%cmake
|
||||
|
||||
%cmake_build
|
||||
%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
|
||||
|
||||
%ifnarch i686 armv7hl
|
||||
%apply_patch %{PATCH0} -p2
|
||||
%endif
|
||||
|
||||
%make_build
|
||||
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
%make_install
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
|
|
@ -83,84 +95,13 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5
|
|||
%files devel
|
||||
%doc docs/README.SDL docs/*.htm
|
||||
%{_includedir}/*
|
||||
%{_libdir}/cmake/zziplib/
|
||||
%exclude %{_libdir}/*.la
|
||||
%{_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
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.71-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Sep 01 2021 Jakub Martisko <jamartis@redhat.com> - 0.13.71-5
|
||||
- Use the multilib patches from RHEL
|
||||
- Resolves ftbfs
|
||||
Resolves: rhbz#1988061
|
||||
Related: rhbz#1915747
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.71-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon Feb 01 2021 Jakub Martisko <jamartis@redhat.com> - 0.13.71-3
|
||||
- Use python3 (versioned) as buildrequires
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.71-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Jan 21 2021 Jakub Martisko <jamartis@redhat.com> - 0.13.71-1
|
||||
- Rebase to 0.13.71
|
||||
- Drop the CVE patches, they are now part of the upstream package
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue