rpms/zlib/devel zlib-1.2.4-autotools.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.10, 1.11 zlib.spec, 1.53, 1.54 minizip-1.2.3-malloc.patch, 1.1, NONE zlib-1.2.3-autotools.patch, 1.4, NONE

Mon Mar 29 10:11:40 UTC 2010

Author: varekova

Update of /cvs/pkgs/rpms/zlib/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26061

Modified Files:
	.cvsignore sources zlib.spec 
Added Files:
	zlib-1.2.4-autotools.patch 
Removed Files:
	minizip-1.2.3-malloc.patch zlib-1.2.3-autotools.patch 
Log Message:
- 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


zlib-1.2.4-autotools.patch:
 Makefile.am   |   32 ++++++++++++++++++++++++++++++++
 configure.ac  |   13 +++++++++++++
 minizip.pc.in |   11 +++++++++++
 3 files changed, 56 insertions(+)

--- NEW FILE zlib-1.2.4-autotools.patch ---
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}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zlib/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	12 Aug 2009 19:50:45 -0000	1.9
+++ .cvsignore	29 Mar 2010 10:11:39 -0000	1.10
@@ -1 +1 @@
-zlib-1.2.3.tar.bz2
+zlib-1.2.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zlib/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Aug 2009 19:50:45 -0000	1.10
+++ sources	29 Mar 2010 10:11:40 -0000	1.11
@@ -1 +1 @@
-dee233bf288ee795ac96a98cc2e369b6  zlib-1.2.3.tar.bz2
+763c6a0b4ad1cdf5549e3ab3f140f4cb  zlib-1.2.4.tar.bz2


Index: zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- zlib.spec	8 Mar 2010 08:09:50 -0000	1.53
+++ zlib.spec	29 Mar 2010 10:11:40 -0000	1.54
@@ -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 minizi
 %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 >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
 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 <vareokva at redhat.com> - 1.2.3-25
+* Mon Mar 29 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 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 <varekova at redhat.com> - 1.2.3-25
 - add Boost license
 
 * Tue Aug 11 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.2.3-24


--- minizip-1.2.3-malloc.patch DELETED ---


--- zlib-1.2.3-autotools.patch DELETED ---

