rpms/zlib/devel zlib-1.2.3-autotools.patch, 1.3, 1.4 zlib.spec, 1.47, 1.48 minizip-1.2.3-autotools.patch, 1.1, NONE zlib-1.2.3-minizip.patch, 1.1, NONE

Tue Mar 17 17:14:03 UTC 2009

Author: kasal

Update of /cvs/extras/rpms/zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25080

Modified Files:
	zlib-1.2.3-autotools.patch zlib.spec 
Removed Files:
	minizip-1.2.3-autotools.patch zlib-1.2.3-minizip.patch 
Log Message:
- consolidate the autoconfiscation patches into one and clean it up
- consequently, clean up the %build and %install sections

zlib-1.2.3-autotools.patch:

Index: zlib-1.2.3-autotools.patch
===================================================================
RCS file: /cvs/extras/rpms/zlib/devel/zlib-1.2.3-autotools.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- zlib-1.2.3-autotools.patch	23 Apr 2007 08:15:53 -0000	1.3
+++ zlib-1.2.3-autotools.patch	17 Mar 2009 17:14:03 -0000	1.4
@@ -1,77 +1,115 @@
---- /dev/null	2007-02-20 10:06:12.587494888 +0100
-+++ zlib-1.2.3/Makefile.am	2007-02-20 13:22:36.000000000 +0100
-@@ -0,0 +1,19 @@
+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 \
-+	inffast.c
-+
-+libz_la_LDFLAGS = \
-+	-version-number 1:2:3
-+
---- /dev/null	2007-02-20 10:06:12.587494888 +0100
-+++ zlib-1.2.3/configure.ac	2007-02-20 13:22:46.000000000 +0100
-@@ -0,0 +1,52 @@
++	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_PREREQ(2.59)
-+AC_INIT([zlib], 1.2.3, [bugzilla.redhat.com])
++AC_INIT([zlib], [1.2.3], [bugzilla.redhat.com])
 +AC_CONFIG_SRCDIR([minigzip.c])
-+AC_CONFIG_HEADER([config.h])
-+AM_INIT_AUTOMAKE([-Wall foreign])
-+
-+# Checks for programs.
-+AC_PROG_CXX
-+AC_PROG_CC
-+AC_PROG_CPP
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_PROG_MAKE_SET
-+AC_PROG_LIBTOOL
-+
-+# Checks for libraries.
-+# FIXME: Replace `main' with a function in `-lz':
-+AC_CHECK_LIB([z], [main])
-+
-+# Checks for header files.
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stddef.h stdlib.h string.h sys/file.h unistd.h utime.h])
-+
-+# Checks for typedefs, structures, and compiler characteristics.
-+AC_HEADER_STDBOOL
-+AC_C_CONST
-+AC_C_INLINE
-+AC_TYPE_OFF_T
-+AC_TYPE_SIZE_T
-+AC_STRUCT_TM
-+AC_C_VOLATILE
-+AC_CHECK_TYPES([ptrdiff_t])
-+
-+# Checks for library functions.
-+AC_FUNC_CHOWN
-+AC_FUNC_ERROR_AT_LINE
-+AC_FUNC_FSEEKO
-+AC_FUNC_MALLOC
-+AC_FUNC_MEMCMP
-+AC_FUNC_MKTIME
-+AC_FUNC_MMAP
-+AC_FUNC_REALLOC
-+AC_FUNC_STAT
-+AC_FUNC_UTIME_NULL
-+AC_FUNC_VPRINTF
-+AC_CHECK_FUNCS([ftruncate memmove memset mkdir munmap strdup strerror strrchr strtol utime])
-+
-+AC_CONFIG_FILES([Makefile])
++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 <sys/types.h> /* for off_t */
+ #  include <unistd.h>    /* for SEEK_* and off_t */
+ #  ifdef VMS


Index: zlib.spec
===================================================================
RCS file: /cvs/extras/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- zlib.spec	25 Feb 2009 18:43:43 -0000	1.47
+++ zlib.spec	17 Mar 2009 17:14:03 -0000	1.48
@@ -1,12 +1,10 @@
 Summary: The zlib compression and decompression library
 Name: zlib
 Version: 1.2.3
-Release: 20%{?dist}
+Release: 21%{?dist}
 Group: System Environment/Libraries
 Source: http://www.zlib.net/zlib-%{version}.tar.gz
 Patch3: zlib-1.2.3-autotools.patch
-Patch4: minizip-1.2.3-autotools.patch
-Patch5: zlib-1.2.3-minizip.patch
 Patch6: minizip-1.2.3-malloc.patch
 URL: http://www.gzip.org/zlib/
 License: zlib
@@ -58,9 +56,9 @@
 
 %prep
 %setup -q
-%patch3 -p1 -b .autotools
-%patch4 -p1 -b .autotools2
-%patch5 -p1 -b .inc
+%patch3 -p1 -b .atools
+# patch cannot create an empty dir
+mkdir m4
 %patch6 -p1 -b .mal
 iconv -f windows-1252 -t utf-8 <ChangeLog >ChangeLog.tmp
 mv ChangeLog.tmp ChangeLog
@@ -71,45 +69,18 @@
 %configure
 make %{?_smp_mflags}
 
-cd contrib/minizip
-export CPPFLAGS="-I../.."
-export LDFLAGS="-L../.."
-sh autogen.sh
-%configure --enable-static=no
-make
-
 %check
 make test -f Makefile.old
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make install DESTDIR=$RPM_BUILD_ROOT  libdir=/%{_lib}
-
-mkdir $RPM_BUILD_ROOT%{_prefix}
-mkdir $RPM_BUILD_ROOT%{_libdir}/
-mv $RPM_BUILD_ROOT/%{_lib}/libz.a $RPM_BUILD_ROOT/%{_libdir}/
-mv $RPM_BUILD_ROOT/%{_lib}/libz.so $RPM_BUILD_ROOT/%{_libdir}/
-
-ln -sf ../../%{_lib}/libz.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libz.so
-
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
-cp -p zconf.h ${RPM_BUILD_ROOT}%{_includedir}
-cp -p zlib.h ${RPM_BUILD_ROOT}%{_includedir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3
-cp -p zlib.3 ${RPM_BUILD_ROOT}%{_mandir}/man3
+mkdir $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/libz.so.* $RPM_BUILD_ROOT/%{_lib}/
 
-# Remove unuseful files created by libtool
-rm -f $RPM_BUILD_ROOT/%{_lib}/libz.la
-
-# install minizip subpackage
-cd contrib/minizip
-
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-rm -f $RPM_BUILD_ROOT/%{_bindir}/miniunzip
-rm -f $RPM_BUILD_ROOT/%{_bindir}/minizip
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libminizip.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
     
 %clean
@@ -154,6 +125,10 @@
 %{_libdir}/pkgconfig/minizip.pc
 
 %changelog
+* Tue Mar 17 2009 Stepan Kasal <skasal at redhat.com> - 1.2.3-21
+- consolidate the autoconfiscation patches into one and clean it up
+- consequently, clean up the %%build and %%install sections
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- minizip-1.2.3-autotools.patch DELETED ---


--- zlib-1.2.3-minizip.patch DELETED ---


