- fixed minizip Makefile.am (it should use fresh zlib headers and libs)

[packages/zlib.git] / minizip-autotools.patch

diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/autogen.sh zlib-1.2.3.patched/contrib/minizip/autogen.sh
--- zlib-1.2.3.orig/contrib/minizip/autogen.sh	1969-12-31 17:00:00.000000000 -0700
+++ zlib-1.2.3.patched/contrib/minizip/autogen.sh	2007-06-30 23:31:01.000000000 -0600
@@ -0,0 +1,53 @@
+#! /bin/sh
+set -e
+
+# $Id$
+#
+# Copyright (c) 2002  Daniel Elstner  <daniel.elstner@gmx.net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License VERSION 2 as
+# published by the Free Software Foundation.  You are not allowed to
+# use any other version of the license; unless you got the explicit
+# permission from the author to do so.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+
+dir=`echo "$0" | sed 's,[^/]*$,,'`
+test "x${dir}" = "x" && dir='.'
+
+if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
+then
+    echo "This script must be executed directly from the source directory."
+    exit 1
+fi
+
+LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
+AUTOCONF=${AUTOCONF:-autoconf}
+AUTOMAKE=${AUTOMAKE:-automake}
+AUTOHEADER=${AUTOHEADER:-autoheader}
+
+ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
+
+rm -f config.cache acconfig.h
+
+do_cmd() {
+    echo "- $@"
+    $@
+}
+
+do_cmd $ACLOCAL
+do_cmd $LIBTOOLIZE -c --force
+do_cmd $AUTOHEADER
+do_cmd $AUTOCONF
+do_cmd $AUTOMAKE -c --add-missing --foreign
+#do_cmd ./configure "$@"
diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/configure.ac zlib-1.2.3.patched/contrib/minizip/configure.ac
--- zlib-1.2.3.orig/contrib/minizip/configure.ac	1969-12-31 17:00:00.000000000 -0700
+++ zlib-1.2.3.patched/contrib/minizip/configure.ac	2007-06-28 14:57:39.000000000 -0600
@@ -0,0 +1,21 @@
+AC_INIT([minizip], 1.2.3, [info@winimage.com])
+
+AC_PROG_LIBTOOL
+
+#
+# +1 :  ? : +1 == new interface that does not break old one
+# +1 :  ? :  0 == new interface that breaks old one
+#  ? :  ? :  0 == no new interfaces, but breaks apps
+#  ? : +1 :  ? == just some internal changes, nothing breaks but might work better
+# CURRENT : REVISION : AGE
+LIBTOOL_SO_VERSION=0:0:0
+AC_SUBST(LIBTOOL_SO_VERSION)
+
+AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2 dist-zip])
+AM_CONFIG_HEADER([config.h])
+
+AC_LANG_C
+AC_PROG_CC
+AC_PROG_INSTALL
+
+AC_OUTPUT(Makefile minizip.pc)
diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/Makefile.am zlib-1.2.3.patched/contrib/minizip/Makefile.am
--- zlib-1.2.3.orig/contrib/minizip/Makefile.am	1969-12-31 17:00:00.000000000 -0700
+++ zlib-1.2.3.patched/contrib/minizip/Makefile.am	2007-06-28 15:01:34.000000000 -0600
@@ -0,0 +1,41 @@
+METASOURCES = AUTO
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = minizip.pc
+
+lib_LTLIBRARIES = libminizip.la
+library_includedir = $(prefix)/include/minizip
+
+libminizip_la_SOURCES	= \
+	ioapi.c \
+	mztools.c \
+	unzip.c \
+	zip.c
+
+library_include_HEADERS = \
+	crypt.h \
+	ioapi.h \
+	mztools.h \
+	unzip.h \
+	zip.h
+
+EXTRA_DIST = \
+	crypt.h \
+	ioapi.h \
+	mztools.h \
+	unzip.h \
+	zip.h
+
+bin_PROGRAMS = miniunzip minizip
+
+miniunzip_SOURCES = miniunz.c
+miniunzip_LDADD = -lminizip
+miniunzip_CPPFLAGS = -I../../
+
+minizip_SOURCES = minizip.c
+minizip_LDADD = -lminizip
+minizip_CPPFLAGS = -I../../
+
+libminizip_la_CPPFLAGS = -I../../
+libminizip_la_LIBADD = -lz
+libminizip_la_LDFLAGS = -L../../
diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/minizip.pc.in zlib-1.2.3.patched/contrib/minizip/minizip.pc.in
--- zlib-1.2.3.orig/contrib/minizip/minizip.pc.in	1969-12-31 17:00:00.000000000 -0700
+++ zlib-1.2.3.patched/contrib/minizip/minizip.pc.in	2007-06-28 14:55:38.000000000 -0600
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_NAME@
+Description: Minizip zip file manipulation library
+Requires:
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lminizip -lz
+Cflags: -I${includedir}
diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/minizip.spec zlib-1.2.3.patched/contrib/minizip/minizip.spec
--- zlib-1.2.3.orig/contrib/minizip/minizip.spec	1969-12-31 17:00:00.000000000 -0700
+++ zlib-1.2.3.patched/contrib/minizip/minizip.spec	2007-07-01 00:00:41.000000000 -0600
@@ -0,0 +1,76 @@
+Summary:	Minizip manipulates files from a .zip archive
+Name:		minizip
+Version:	1.2.3
+Release:	1
+License:	BSD
+Group:		System Environment/Libraries
+URL:		http://www.winimage.com/zLibDll/minizip.html
+Source0:	http://www.zlib.net/zlib-%{version}.tar.gz
+Patch0:         minizip-%{version}-autotools.patch
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	automake, autoconf, libtool
+BuildRequires:	zlib-devel >= %{version}
+
+%description
+Minizip manipulates files from a .zip archive
+
+
+%package        devel
+Summary:	Development files for the minizip library
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+BuildRequires:	zlib-devel >= %{version}
+
+%description    devel
+This package contains the libraries and header files needed for
+developing applications which use minizip.
+
+
+%prep
+%setup -q -n zlib-%{version}
+%patch0 -p1
+
+%build
+cd contrib/minizip
+sh autogen.sh
+%configure --enable-static=no
+# SMP flags are explicitly omitted due to a libtool/autoconf
+# dependency race condition
+%{__make}
+
+
+%install
+cd contrib/minizip
+%{__rm} -rf %{buildroot}
+
+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc contrib/minizip/ChangeLogUnzip
+%{_bindir}/minizip
+%{_bindir}/miniunzip
+%{_libdir}/libminizip.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/minizip
+%{_libdir}/libminizip.so
+%{_libdir}/pkgconfig/minizip.pc
+
+%changelog
+* Sat Jun 30 2007 Rick L Vinyard Jr <rvinyard@cs.nmsu.edu> - 1.2.3-1
+- Initial version
+