epel9
Petr Písař 4 years ago
parent baa4051dd0
commit c2396679e8

1
.gitignore vendored

@ -1,2 +1,3 @@
/miniz_v115_r4.7z /miniz_v115_r4.7z
/miniz-2.1.0.zip /miniz-2.1.0.zip
/miniz-2.2.0.zip

@ -1,4 +1,4 @@
From 2eeb23af281f056cd0a628a019ee70ccf8c61c25 Mon Sep 17 00:00:00 2001 From dd5cf5e228a90ecfc66257e04fc6dd053fd9c686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 22 May 2019 12:34:13 +0200 Date: Wed, 22 May 2019 12:34:13 +0200
Subject: [PATCH] Examples to include system miniz.h Subject: [PATCH] Examples to include system miniz.h
@ -6,8 +6,8 @@ MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
We build miniz as a dynamic library. Adjust examples to use miniz We build miniz as a dynamic library. Adjust examples to use a miniz
header file from system a location. header file from a system location.
Signed-off-by: Petr Písař <ppisar@redhat.com> Signed-off-by: Petr Písař <ppisar@redhat.com>
--- ---
@ -33,14 +33,14 @@ index d6e33fa..7cb2556 100644
typedef unsigned short uint16; typedef unsigned short uint16;
typedef unsigned int uint; typedef unsigned int uint;
diff --git a/examples/example2.c b/examples/example2.c diff --git a/examples/example2.c b/examples/example2.c
index c3a84ba..bc9fba5 100644 index 03d2409..bc9fba5 100644
--- a/examples/example2.c --- a/examples/example2.c
+++ b/examples/example2.c +++ b/examples/example2.c
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
#endif #endif
#include <stdio.h> #include <stdio.h>
-#include "miniz_zip.h" -#include "miniz.h"
+#include <miniz.h> +#include <miniz.h>
typedef unsigned char uint8; typedef unsigned char uint8;
@ -59,13 +59,13 @@ index a97ba84..7aaac31 100644
typedef unsigned char uint8; typedef unsigned char uint8;
typedef unsigned short uint16; typedef unsigned short uint16;
diff --git a/examples/example4.c b/examples/example4.c diff --git a/examples/example4.c b/examples/example4.c
index eb591d4..2e6d3f6 100644 index 3f2d7cf..2e6d3f6 100644
--- a/examples/example4.c --- a/examples/example4.c
+++ b/examples/example4.c +++ b/examples/example4.c
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
// example4.c - Uses tinfl.c to decompress a zlib stream in memory to an output file // example4.c - Uses tinfl.c to decompress a zlib stream in memory to an output file
// Public domain, May 15 2011, Rich Geldreich, richgel99@gmail.com. See "unlicense" statement at the end of tinfl.c. // Public domain, May 15 2011, Rich Geldreich, richgel99@gmail.com. See "unlicense" statement at the end of tinfl.c.
-#include "miniz_tinfl.h" -#include "miniz.h"
+#include <miniz.h> +#include <miniz.h>
#include <stdio.h> #include <stdio.h>
#include <limits.h> #include <limits.h>
@ -97,5 +97,5 @@ index abbb64f..7878848 100644
// Now include stdio.h because this test uses fopen(), etc. (but we still don't want miniz.c's stdio stuff, for testing). // Now include stdio.h because this test uses fopen(), etc. (but we still don't want miniz.c's stdio stuff, for testing).
#include <stdio.h> #include <stdio.h>
-- --
2.20.1 2.31.1

@ -1,2 +1 @@
from Config import * addFilter('spelling-error .* (fastlz|minilzo|zlib)')
addFilter("spelling-error .* (fastlz|minilzo|zlib)");

@ -3,8 +3,8 @@
%endif %endif
Name: miniz Name: miniz
Version: 2.1.0 Version: 2.2.0
Release: 8%{?dist} Release: 1%{?dist}
Summary: Compression library implementing the zlib and Deflate Summary: Compression library implementing the zlib and Deflate
# LICENSE: MIT text # LICENSE: MIT text
# miniz.c: MIT # miniz.c: MIT
@ -16,7 +16,7 @@ URL: https://github.com/richgel999/%{name}
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.zip Source0: %{url}/releases/download/%{version}/%{name}-%{version}.zip
# Adjust examples for building against a system miniz library, # Adjust examples for building against a system miniz library,
# not suitable for upstream that prefers a copy-lib approach. # not suitable for upstream that prefers a copy-lib approach.
Patch0: miniz-2.1.0-Examples-to-include-system-miniz.h.patch Patch0: miniz-2.2.0-Examples-to-include-system-miniz.h.patch
BuildRequires: coreutils BuildRequires: coreutils
# diffutils for cmp # diffutils for cmp
BuildRequires: diffutils BuildRequires: diffutils
@ -131,6 +131,9 @@ install -m 0644 %{name}.h '%{buildroot}/%{_includedir}'
%changelog %changelog
* Wed Aug 11 2021 Petr Pisar <ppisar@redhat.com> - 2.2.0-1
- 2.2.0 bump
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-8 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

@ -1 +1 @@
SHA512 (miniz-2.1.0.zip) = 03fb5d351e83b8e26bc9bb342dcfcd975c7838d5900ca57460364d40151cb9638254ee51393b6c665f4a1d5bb1e901e5c761cb9d5b9c3ede9f1cd20ad14be609 SHA512 (miniz-2.2.0.zip) = d0757aa5c9246adfcd155b6be51e0b36f358ce9bc98ff651a5865057f024e927134abf9502f2306552537f11b344dbdb152eff8830d16d7f8ef936cf65562cd6

Loading…
Cancel
Save