]> git.pld-linux.org Git - packages/zlib.git/blob - minizip-autotools.patch
- conflict with broken libxml
[packages/zlib.git] / minizip-autotools.patch
1 diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/autogen.sh zlib-1.2.3.patched/contrib/minizip/autogen.sh
2 --- zlib-1.2.3.orig/contrib/minizip/autogen.sh  1969-12-31 17:00:00.000000000 -0700
3 +++ zlib-1.2.3.patched/contrib/minizip/autogen.sh       2007-06-30 23:31:01.000000000 -0600
4 @@ -0,0 +1,53 @@
5 +#! /bin/sh
6 +set -e
7 +
8 +# $Id$
9 +#
10 +# Copyright (c) 2002  Daniel Elstner  <daniel.elstner@gmx.net>
11 +#
12 +# This program is free software; you can redistribute it and/or modify
13 +# it under the terms of the GNU General Public License VERSION 2 as
14 +# published by the Free Software Foundation.  You are not allowed to
15 +# use any other version of the license; unless you got the explicit
16 +# permission from the author to do so.
17 +#
18 +# This program is distributed in the hope that it will be useful,
19 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
20 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 +# GNU General Public License for more details.
22 +#
23 +# You should have received a copy of the GNU General Public License
24 +# along with this program; if not, write to the Free Software
25 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
26 +# 02110-1301, USA.
27 +
28 +
29 +dir=`echo "$0" | sed 's,[^/]*$,,'`
30 +test "x${dir}" = "x" && dir='.'
31 +
32 +if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
33 +then
34 +    echo "This script must be executed directly from the source directory."
35 +    exit 1
36 +fi
37 +
38 +LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
39 +AUTOCONF=${AUTOCONF:-autoconf}
40 +AUTOMAKE=${AUTOMAKE:-automake}
41 +AUTOHEADER=${AUTOHEADER:-autoheader}
42 +
43 +ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
44 +
45 +rm -f config.cache acconfig.h
46 +
47 +do_cmd() {
48 +    echo "- $@"
49 +    $@
50 +}
51 +
52 +do_cmd $ACLOCAL
53 +do_cmd $LIBTOOLIZE -c --force
54 +do_cmd $AUTOHEADER
55 +do_cmd $AUTOCONF
56 +do_cmd $AUTOMAKE -c --add-missing --foreign
57 +#do_cmd ./configure "$@"
58 diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/configure.ac zlib-1.2.3.patched/contrib/minizip/configure.ac
59 --- zlib-1.2.3.orig/contrib/minizip/configure.ac        1969-12-31 17:00:00.000000000 -0700
60 +++ zlib-1.2.3.patched/contrib/minizip/configure.ac     2007-06-28 14:57:39.000000000 -0600
61 @@ -0,0 +1,21 @@
62 +AC_INIT([minizip], 1.2.3, [info@winimage.com])
63 +
64 +AC_PROG_LIBTOOL
65 +
66 +#
67 +# +1 :  ? : +1 == new interface that does not break old one
68 +# +1 :  ? :  0 == new interface that breaks old one
69 +#  ? :  ? :  0 == no new interfaces, but breaks apps
70 +#  ? : +1 :  ? == just some internal changes, nothing breaks but might work better
71 +# CURRENT : REVISION : AGE
72 +LIBTOOL_SO_VERSION=0:0:0
73 +AC_SUBST(LIBTOOL_SO_VERSION)
74 +
75 +AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2 dist-zip])
76 +AM_CONFIG_HEADER([config.h])
77 +
78 +AC_LANG_C
79 +AC_PROG_CC
80 +AC_PROG_INSTALL
81 +
82 +AC_OUTPUT(Makefile minizip.pc)
83 diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/Makefile.am zlib-1.2.3.patched/contrib/minizip/Makefile.am
84 --- zlib-1.2.3.orig/contrib/minizip/Makefile.am 1969-12-31 17:00:00.000000000 -0700
85 +++ zlib-1.2.3.patched/contrib/minizip/Makefile.am      2007-06-28 15:01:34.000000000 -0600
86 @@ -0,0 +1,41 @@
87 +METASOURCES = AUTO
88 +
89 +pkgconfigdir = $(libdir)/pkgconfig
90 +pkgconfig_DATA = minizip.pc
91 +
92 +lib_LTLIBRARIES = libminizip.la
93 +library_includedir = $(prefix)/include/minizip
94 +
95 +libminizip_la_SOURCES  = \
96 +       ioapi.c \
97 +       mztools.c \
98 +       unzip.c \
99 +       zip.c
100 +
101 +library_include_HEADERS = \
102 +       crypt.h \
103 +       ioapi.h \
104 +       mztools.h \
105 +       unzip.h \
106 +       zip.h
107 +
108 +EXTRA_DIST = \
109 +       crypt.h \
110 +       ioapi.h \
111 +       mztools.h \
112 +       unzip.h \
113 +       zip.h
114 +
115 +bin_PROGRAMS = miniunzip minizip
116 +
117 +miniunzip_SOURCES = miniunz.c
118 +miniunzip_LDADD = -lminizip
119 +miniunzip_CPPFLAGS = -I../../
120 +
121 +minizip_SOURCES = minizip.c
122 +minizip_LDADD = -lminizip
123 +minizip_CPPFLAGS = -I../../
124 +
125 +libminizip_la_CPPFLAGS = -I../../
126 +libminizip_la_LIBADD = -lz
127 +libminizip_la_LDFLAGS = -L../../
128 diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/minizip.pc.in zlib-1.2.3.patched/contrib/minizip/minizip.pc.in
129 --- zlib-1.2.3.orig/contrib/minizip/minizip.pc.in       1969-12-31 17:00:00.000000000 -0700
130 +++ zlib-1.2.3.patched/contrib/minizip/minizip.pc.in    2007-06-28 14:55:38.000000000 -0600
131 @@ -0,0 +1,11 @@
132 +prefix=@prefix@
133 +exec_prefix=@exec_prefix@
134 +libdir=@libdir@
135 +includedir=@includedir@
136 +
137 +Name: @PACKAGE_NAME@
138 +Description: Minizip zip file manipulation library
139 +Requires:
140 +Version: @PACKAGE_VERSION@
141 +Libs: -L${libdir} -lminizip -lz
142 +Cflags: -I${includedir}
143 diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/minizip.spec zlib-1.2.3.patched/contrib/minizip/minizip.spec
144 --- zlib-1.2.3.orig/contrib/minizip/minizip.spec        1969-12-31 17:00:00.000000000 -0700
145 +++ zlib-1.2.3.patched/contrib/minizip/minizip.spec     2007-07-01 00:00:41.000000000 -0600
146 @@ -0,0 +1,76 @@
147 +Summary:       Minizip manipulates files from a .zip archive
148 +Name:          minizip
149 +Version:       1.2.3
150 +Release:       1
151 +License:       BSD
152 +Group:         System Environment/Libraries
153 +URL:           http://www.winimage.com/zLibDll/minizip.html
154 +Source0:       http://www.zlib.net/zlib-%{version}.tar.gz
155 +Patch0:         minizip-%{version}-autotools.patch
156 +Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
157 +BuildRequires: automake, autoconf, libtool
158 +BuildRequires: zlib-devel >= %{version}
159 +
160 +%description
161 +Minizip manipulates files from a .zip archive
162 +
163 +
164 +%package        devel
165 +Summary:       Development files for the minizip library
166 +Group:          Development/Libraries
167 +Requires:       %{name} = %{version}-%{release}
168 +BuildRequires: zlib-devel >= %{version}
169 +
170 +%description    devel
171 +This package contains the libraries and header files needed for
172 +developing applications which use minizip.
173 +
174 +
175 +%prep
176 +%setup -q -n zlib-%{version}
177 +%patch0 -p1
178 +
179 +%build
180 +cd contrib/minizip
181 +sh autogen.sh
182 +%configure --enable-static=no
183 +# SMP flags are explicitly omitted due to a libtool/autoconf
184 +# dependency race condition
185 +%{__make}
186 +
187 +
188 +%install
189 +cd contrib/minizip
190 +%{__rm} -rf %{buildroot}
191 +
192 +%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
193 +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
194 +
195 +
196 +%clean
197 +%{__rm} -rf %{buildroot}
198 +
199 +
200 +%post -p /sbin/ldconfig
201 +
202 +
203 +%postun -p /sbin/ldconfig
204 +
205 +
206 +%files
207 +%defattr(-,root,root,-)
208 +%doc contrib/minizip/ChangeLogUnzip
209 +%{_bindir}/minizip
210 +%{_bindir}/miniunzip
211 +%{_libdir}/libminizip.so.*
212 +
213 +%files devel
214 +%defattr(-,root,root,-)
215 +%{_includedir}/minizip
216 +%{_libdir}/libminizip.so
217 +%{_libdir}/pkgconfig/minizip.pc
218 +
219 +%changelog
220 +* Sat Jun 30 2007 Rick L Vinyard Jr <rvinyard@cs.nmsu.edu> - 1.2.3-1
221 +- Initial version
222 +
This page took 0.061863 seconds and 3 git commands to generate.