From c82e048a83770831dc9549ca30aae150dab5794a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 6 Nov 2019 15:30:24 +0000 Subject: [PATCH 1/6] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..722a10b --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# minizip1.2 + +The minizip1.2 package \ No newline at end of file From f941154baeb76b0140e7cc6c69fc47a1544ea6ad Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 6 Nov 2019 09:31:47 -0600 Subject: [PATCH 2/6] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From dc3caadf0afff3b4ce71d368931aa6f658724d51 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 6 Nov 2019 10:42:37 -0500 Subject: [PATCH 3/6] initial package --- .gitignore | 1 + minizip1.2.spec | 84 +++++++++++++++++++++++++++++ sources | 1 + zlib-1.2.5-minizip-fixuncrypt.patch | 14 +++++ 4 files changed, 100 insertions(+) create mode 100644 .gitignore create mode 100644 minizip1.2.spec create mode 100644 sources create mode 100644 zlib-1.2.5-minizip-fixuncrypt.patch diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c338974 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/zlib-1.2.11.tar.xz diff --git a/minizip1.2.spec b/minizip1.2.spec new file mode 100644 index 0000000..761fe62 --- /dev/null +++ b/minizip1.2.spec @@ -0,0 +1,84 @@ +Name: minizip1.2 +Summary: Library for manipulation with .zip archives +Version: 1.2.11 +Release: 23 +License: zlib +URL: http://www.zlib.net/ +Source: http://www.zlib.net/zlib-%{version}.tar.xz +# https://github.com/madler/zlib/pull/210 +Patch0: zlib-1.2.5-minizip-fixuncrypt.patch +BuildRequires: autoconf, automake, libtool +BuildRequires: zlib-devel >= %{version} +BuildRequires: gcc +Provides: minizip-compat = %{version}-%{release} + +%description +Minizip is a library for manipulation with files from .zip archives. +This package contains the old minizip API, as bundled with zlib. + +%package devel +Summary: Development files for the minizip library +Requires: minizip1.2%{?_isa} = %{version}-%{release} +Requires: zlib-devel%{?_isa} >= %{version} +Conflicts: minizip-devel +Provides: minizip-compat-devel = %{version}-%{release} + +%description devel +This package contains the libraries and header files needed for +developing applications which use the old minizip API. + +%prep +%setup -q -n zlib-%{version} +%patch0 -p1 -b .fixuncrypt + +%build +export CFLAGS="$RPM_OPT_FLAGS" +%ifarch ppc64 +CFLAGS+=" -O3" +%endif +%ifarch aarch64 +CFLAGS+=" -DARM_NEON -O3" +%endif +%ifarch s390 s390x +CFLAGS+=" -DDFLTCC" +%endif + +export MKFLAGS="" +%ifarch s390 s390x +MKFLAGS+="OBJA=dfltcc.o PIC_OBJA=dfltcc.lo" +%endif + +export LDFLAGS="$LDFLAGS -Wl,-z,relro -Wl,-z,now" + +cd contrib/minizip +autoreconf --install +%configure --enable-static=no +%make_build + +%install +%make_install -C contrib/minizip +# https://github.com/madler/zlib/pull/229 +rm $RPM_BUILD_ROOT%_includedir/minizip/crypt.h + +find $RPM_BUILD_ROOT -name '*.la' -delete + +%files +%license README +%doc contrib/minizip/MiniZip64_info.txt contrib/minizip/MiniZip64_Changes.txt +%{_libdir}/libminizip.so.* + +%files devel +%dir %{_includedir}/minizip +%{_includedir}/minizip/*.h +%{_libdir}/libminizip.so +%{_libdir}/pkgconfig/minizip.pc + +%changelog +* Wed Nov 6 2019 Tom Callaway - 1.2.11-23 +- add BR: gcc + +* Tue Nov 5 2019 Tom Callaway - 1.2.11-22 +- rename to minizip1.2, add provides for minizip-compat naming + +* Fri Nov 1 2019 Tom Callaway - 1.2.11-21 +- standalone minizip-compat package for epel8 diff --git a/sources b/sources new file mode 100644 index 0000000..90377f8 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (zlib-1.2.11.tar.xz) = b7f50ada138c7f93eb7eb1631efccd1d9f03a5e77b6c13c8b757017b2d462e19d2d3e01c50fad60a4ae1bc86d431f6f94c72c11ff410c25121e571953017cb67 diff --git a/zlib-1.2.5-minizip-fixuncrypt.patch b/zlib-1.2.5-minizip-fixuncrypt.patch new file mode 100644 index 0000000..d113879 --- /dev/null +++ b/zlib-1.2.5-minizip-fixuncrypt.patch @@ -0,0 +1,14 @@ +diff -up zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt zlib-1.2.5/contrib/minizip/unzip.c +--- zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt 2011-11-11 12:13:56.335867758 -0500 ++++ zlib-1.2.5/contrib/minizip/unzip.c 2011-11-11 12:14:01.747799372 -0500 +@@ -68,10 +68,6 @@ + #include + #include + +-#ifndef NOUNCRYPT +- #define NOUNCRYPT +-#endif +- + #include "zlib.h" + #include "unzip.h" + From fa91af9052f0cd724644582217dc201adad16b2c Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 6 Nov 2019 11:52:12 -0500 Subject: [PATCH 4/6] add dist tag --- minizip1.2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/minizip1.2.spec b/minizip1.2.spec index 761fe62..8885c1b 100644 --- a/minizip1.2.spec +++ b/minizip1.2.spec @@ -1,7 +1,7 @@ Name: minizip1.2 Summary: Library for manipulation with .zip archives Version: 1.2.11 -Release: 23 +Release: 24%{?dist} License: zlib URL: http://www.zlib.net/ Source: http://www.zlib.net/zlib-%{version}.tar.xz @@ -74,6 +74,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %{_libdir}/pkgconfig/minizip.pc %changelog +* Wed Nov 6 2019 Tom Callaway - 1.2.11-24 +- add dist tag + * Wed Nov 6 2019 Tom Callaway - 1.2.11-23 - add BR: gcc From 9a8b03541b2aece7c50cd1ac49c01a75bbaab86c Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 16:27:10 +0000 Subject: [PATCH 5/6] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 67afee10f7933ff1eac6ee4ae0fffbd525521a68 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:29:42 +0300 Subject: [PATCH 6/6] Remove unnecessary files --- README.md | 3 --- sources | 1 - 2 files changed, 4 deletions(-) delete mode 100644 README.md delete mode 100644 sources diff --git a/README.md b/README.md deleted file mode 100644 index 722a10b..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# minizip1.2 - -The minizip1.2 package \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 90377f8..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (zlib-1.2.11.tar.xz) = b7f50ada138c7f93eb7eb1631efccd1d9f03a5e77b6c13c8b757017b2d462e19d2d3e01c50fad60a4ae1bc86d431f6f94c72c11ff410c25121e571953017cb67