From 44d235dea8a90f47531e15d2028e5043aa288d01 Mon Sep 17 00:00:00 2001 From: Ivana Varekova Date: Mon, 29 Mar 2010 10:11:40 +0000 Subject: [PATCH] - update to 1.2.4 use the upstream make/configure files for zlib, change additional makefile/configure file to be used only for minizip add pkgconfig to zlib --- .cvsignore | 2 +- minizip-1.2.3-malloc.patch | 15 ----- sources | 2 +- zlib-1.2.3-autotools.patch | 115 ------------------------------------- zlib-1.2.4-autotools.patch | 68 ++++++++++++++++++++++ zlib.spec | 38 +++++++----- 6 files changed, 94 insertions(+), 146 deletions(-) delete mode 100644 minizip-1.2.3-malloc.patch delete mode 100644 zlib-1.2.3-autotools.patch create mode 100644 zlib-1.2.4-autotools.patch diff --git a/.cvsignore b/.cvsignore index 0d08977..0c266d8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zlib-1.2.3.tar.bz2 +zlib-1.2.4.tar.bz2 diff --git a/minizip-1.2.3-malloc.patch b/minizip-1.2.3-malloc.patch deleted file mode 100644 index 1f4c3fd..0000000 --- a/minizip-1.2.3-malloc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up zlib-1.2.3/contrib/minizip/miniunz.c.pom zlib-1.2.3/contrib/minizip/miniunz.c ---- zlib-1.2.3/contrib/minizip/miniunz.c.pom 2005-07-12 20:08:40.000000000 +0200 -+++ zlib-1.2.3/contrib/minizip/miniunz.c 2008-12-01 11:12:23.000000000 +0100 -@@ -112,6 +112,11 @@ int makedir (newdir) - return 0; - - buffer = (char*)malloc(len+1); -+ if (buffer==NULL) -+ { -+ printf("Error allocating memory\n"); -+ return UNZ_INTERNALERROR; -+ } - strcpy(buffer,newdir); - - if (buffer[len-1] == '/') { diff --git a/sources b/sources index 71b1da9..c53c36f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 +763c6a0b4ad1cdf5549e3ab3f140f4cb zlib-1.2.4.tar.bz2 diff --git a/zlib-1.2.3-autotools.patch b/zlib-1.2.3-autotools.patch deleted file mode 100644 index 63e5cda..0000000 --- a/zlib-1.2.3-autotools.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am ---- zlib-1.2.3.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ zlib-1.2.3.kasal/Makefile.am 2009-03-17 17:58:36.000000000 +0100 -@@ -0,0 +1,67 @@ -+ACLOCAL_AMFLAGS = -I m4 --install -+ -+lib_LTLIBRARIES = libz.la -+ -+libz_la_SOURCES = \ -+ adler32.c \ -+ compress.c \ -+ crc32.c \ -+ crc32.h \ -+ gzio.c \ -+ uncompr.c \ -+ deflate.c \ -+ deflate.h \ -+ trees.c \ -+ trees.h \ -+ zutil.c \ -+ zutil.h \ -+ inflate.c \ -+ inflate.h \ -+ infback.c \ -+ inftrees.c \ -+ inftrees.h \ -+ inffast.c \ -+ inffast.h \ -+ infflate.h -+ -+# Use -version-number to match the file name used before autoconfiscation. -+libz_la_LDFLAGS = -version-number 1:2:3 -+ -+include_HEADERS = zlib.h -+nodist_include_HEADERS = zconf.h -+ -+dist_man_MANS = zlib.3 -+ -+## libminizip: -+ -+lib_LTLIBRARIES += libminizip.la -+ -+libminizip_la_SOURCES = \ -+ contrib/minizip/ioapi.c \ -+ contrib/minizip/mztools.c \ -+ contrib/minizip/unzip.c \ -+ contrib/minizip/zip.c -+ -+# do not build the static version of libminizip -+libminizip_la_CFLAGS = -shared -+libminizip_la_LDFLAGS = -version-info 1:0:0 -+libminizip_la_LIBADD = libz.la -+ -+minizip_includedir = $(includedir)/minizip -+minizip_include_HEADERS = \ -+ contrib/minizip/crypt.h \ -+ contrib/minizip/ioapi.h \ -+ contrib/minizip/mztools.h \ -+ contrib/minizip/unzip.h \ -+ contrib/minizip/zip.h -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = minizip.pc -+ -+EXTRA_PROGRAMS = miniunzip minizip -+ -+miniunzip_SOURCES = contrib/minizip/miniunz.c -+miniunzip_LDADD = libminizip.la -+ -+minizip_SOURCES = contrib/minizip/minizip.c -+minizip_LDADD = libminizip.la -diff -urN zlib-1.2.3.orig/configure.ac zlib-1.2.3.kasal/configure.ac ---- zlib-1.2.3.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ zlib-1.2.3.kasal/configure.ac 2009-03-17 17:28:41.000000000 +0100 -@@ -0,0 +1,13 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_INIT([zlib], [1.2.3], [bugzilla.redhat.com]) -+AC_CONFIG_SRCDIR([minigzip.c]) -+AC_CONFIG_MACRO_DIR([m4]) -+AM_INIT_AUTOMAKE([foreign]) -+LT_INIT -+ -+AC_SUBST([HAVE_UNISTD_H], [0]) -+AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) -+AC_CONFIG_FILES([Makefile minizip.pc zconf.h:zconf.in.h]) -+AC_OUTPUT -diff -urN zlib-1.2.3.orig/minizip.pc.in zlib-1.2.3.kasal/minizip.pc.in ---- zlib-1.2.3.orig/minizip.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ zlib-1.2.3.kasal/minizip.pc.in 2009-01-07 15:49:34.000000000 +0100 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@/minizip -+ -+Name: minizip -+Description: Minizip zip file manipulation library -+Requires: -+Version: @PACKAGE_VERSION@ -+Libs: -L${libdir} -lminizip -lz -+Cflags: -I${includedir} -diff -urN zlib-1.2.3.orig/zconf.in.h zlib-1.2.3.kasal/zconf.in.h ---- zlib-1.2.3.orig/zconf.in.h 2005-05-28 08:40:35.000000000 +0200 -+++ zlib-1.2.3.kasal/zconf.in.h 2009-03-17 17:17:11.000000000 +0100 -@@ -284,7 +284,7 @@ - typedef Byte *voidp; - #endif - --#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ -+#if @HAVE_UNISTD_H@ /* HAVE_UNISTD_H -- this line is updated by ./configure */ - # include /* for off_t */ - # include /* for SEEK_* and off_t */ - # ifdef VMS diff --git a/zlib-1.2.4-autotools.patch b/zlib-1.2.4-autotools.patch new file mode 100644 index 0000000..6ca26e8 --- /dev/null +++ b/zlib-1.2.4-autotools.patch @@ -0,0 +1,68 @@ +diff -up zlib-1.2.4/contrib/minizip/configure.ac.atools zlib-1.2.4/contrib/minizip/configure.ac +--- zlib-1.2.4/contrib/minizip/configure.ac.atools 2010-03-29 10:28:50.000000000 +0200 ++++ zlib-1.2.4/contrib/minizip/configure.ac 2010-03-29 10:28:50.000000000 +0200 +@@ -0,0 +1,13 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_INIT([minizep], [1.2.4], [bugzilla.redhat.com]) ++AC_CONFIG_SRCDIR([minigzip.c]) ++AC_CONFIG_MACRO_DIR([m4]) ++AM_INIT_AUTOMAKE([foreign]) ++LT_INIT ++ ++AC_SUBST([HAVE_UNISTD_H], [0]) ++AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) ++AC_CONFIG_FILES([Makefile minizip.pc]) ++AC_OUTPUT +diff -up zlib-1.2.4/contrib/minizip/Makefile.am.atools zlib-1.2.4/contrib/minizip/Makefile.am +--- zlib-1.2.4/contrib/minizip/Makefile.am.atools 2010-03-29 10:28:50.000000000 +0200 ++++ zlib-1.2.4/contrib/minizip/Makefile.am 2010-03-29 10:32:11.000000000 +0200 +@@ -0,0 +1,32 @@ ++ACLOCAL_AMFLAGS = -I m4 --install ++ ++lib_LTLIBRARIES = libminizip.la ++ ++libminizip_la_SOURCES = \ ++ ioapi.c \ ++ mztools.c \ ++ unzip.c \ ++ zip.c ++ ++# do not build the static version of libminizip ++libminizip_la_CFLAGS = -shared ++libminizip_la_LDFLAGS = -version-info 1:0:0 ++ ++minizip_includedir = $(includedir)/minizip ++minizip_include_HEADERS = \ ++ crypt.h \ ++ ioapi.h \ ++ mztools.h \ ++ unzip.h \ ++ zip.h ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = minizip.pc ++ ++EXTRA_PROGRAMS = miniunzip minizip ++ ++miniunzip_SOURCES = miniunz.c ++miniunzip_LDADD = libminizip.la ++ ++minizip_SOURCES = minizip.c ++minizip_LDADD = libminizip.la +diff -up zlib-1.2.4/contrib/minizip/minizip.pc.in.atools zlib-1.2.4/contrib/minizip/minizip.pc.in +--- zlib-1.2.4/contrib/minizip/minizip.pc.in.atools 2010-03-29 10:28:50.000000000 +0200 ++++ zlib-1.2.4/contrib/minizip/minizip.pc.in 2010-03-29 10:28:50.000000000 +0200 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@/minizip ++ ++Name: minizip ++Description: Minizip zip file manipulation library ++Requires: ++Version: @PACKAGE_VERSION@ ++Libs: -L${libdir} -lminizip -lz ++Cflags: -I${includedir} diff --git a/zlib.spec b/zlib.spec index 7a941f1..4745db1 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,13 +1,12 @@ Summary: The zlib compression and decompression library Name: zlib -Version: 1.2.3 -Release: 25%{?dist} +Version: 1.2.4 +Release: 1%{?dist} Group: System Environment/Libraries Source: http://www.zlib.net/zlib-%{version}.tar.bz2 -Patch3: zlib-1.2.3-autotools.patch -Patch6: minizip-1.2.3-malloc.patch +Patch3: zlib-1.2.4-autotools.patch URL: http://www.gzip.org/zlib/ -# /contrib/dotzlib/ have Boost license +# /contrib/dotzlib/ have Boost license License: zlib and Boost BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake, autoconf, libtool @@ -59,25 +58,26 @@ developing applications which use minizip. %setup -q %patch3 -p1 -b .atools # patch cannot create an empty dir -mkdir m4 -%patch6 -p1 -b .mal +mkdir contrib/minizip/m4 +cp minigzip.c contrib/minizip iconv -f windows-1252 -t utf-8 ChangeLog.tmp mv ChangeLog.tmp ChangeLog -cp Makefile Makefile.old %build -autoreconf --install; +./configure --libdir=%{_libdir} --includedir=%{_includedir} --prefix=%{_prefix} +make %{?_smp_mflags} +cd contrib/minizip +autoreconf --install %configure make %{?_smp_mflags} %check -make test -f Makefile.old +make test %install rm -rf ${RPM_BUILD_ROOT} make install DESTDIR=$RPM_BUILD_ROOT - mkdir $RPM_BUILD_ROOT/%{_lib} mv $RPM_BUILD_ROOT%{_libdir}/libz.so.* $RPM_BUILD_ROOT/%{_lib}/ @@ -85,6 +85,9 @@ reldir=$(echo %{_libdir} | sed 's,/$,,;s,/[^/]\+,../,g')%{_lib} oldlink=$(readlink $RPM_BUILD_ROOT%{_libdir}/libz.so) ln -sf $reldir/$(basename $oldlink) $RPM_BUILD_ROOT%{_libdir}/libz.so +cd contrib/minizip +make install DESTDIR=$RPM_BUILD_ROOT + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -106,11 +109,12 @@ rm -rf ${RPM_BUILD_ROOT} %files devel %defattr(-,root,root,-) -%doc README algorithm.txt minigzip.c example.c +%doc README doc/algorithm.txt example.c %{_libdir}/libz.so %{_includedir}/zconf.h %{_includedir}/zlib.h %{_mandir}/man3/zlib.3* +%{_libdir}/pkgconfig/zlib.pc %files static %defattr(-,root,root,-) @@ -119,7 +123,7 @@ rm -rf ${RPM_BUILD_ROOT} %files -n minizip %defattr(-,root,root,-) -%doc contrib/minizip/ChangeLogUnzip +%doc contrib/minizip/MiniZip64_info.txt contrib/minizip/MiniZip64_Changes.txt %{_libdir}/libminizip.so.* %files -n minizip-devel @@ -130,7 +134,13 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/pkgconfig/minizip.pc %changelog -* Mon Mar 8 2010 Ivana Hutarova Varekova - 1.2.3-25 +* Mon Mar 29 2010 Ivana Hutarova Varekova - 1.2.4-1 +- update to 1.2.4 + use the upstream make/configure files for zlib, + change additional makefile/configure file to be used only to minizip + add pkgconfig to zlib + +* Mon Mar 8 2010 Ivana Hutarova Varekova - 1.2.3-25 - add Boost license * Tue Aug 11 2009 Ville Skyttä - 1.2.3-24