rpms/mingw-zlib
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.2.5

Browse Source 
- Use %global instead of %define
- Automatically generate debuginfo subpackage
- Use correct %defattr tag
- Merged the changes from the native Fedora package
This commit is contained in:
Erik van Pienbroek 2010-09-12 17:21:25 +02:00
parent fe300b472a
commit 89656ebd25
7 changed files with 54 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
zlib-1.2.3.tar.gz zlib-1.2.3.tar.gz
/zlib-1.2.5.tar.gz

25
zlib-1.2.3-autotools.patch → mingw32-zlib-1.2.5-autotools.patch
View File

@ -1,7 +1,7 @@
diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am 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.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 +++ zlib-1.2.3.kasal/Makefile.am 2009-03-17 17:58:36.000000000 +0100
@@ -0,0 +1,67 @@ @@ -0,0 +1,70 @@
+ACLOCAL_AMFLAGS = -I m4 --install +ACLOCAL_AMFLAGS = -I m4 --install
+ +
+lib_LTLIBRARIES = libz.la +lib_LTLIBRARIES = libz.la
@ -11,7 +11,10 @@ diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am
+ compress.c \ + compress.c \
+ crc32.c \ + crc32.c \
+ crc32.h \ + crc32.h \
+ gzio.c \ + gzclose.c \
+ gzlib.c \
+ gzread.c \
+ gzwrite.c \
+ uncompr.c \ + uncompr.c \
+ deflate.c \ + deflate.c \
+ deflate.h \ + deflate.h \
@ -29,7 +32,7 @@ diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am
+ infflate.h + infflate.h
+ +
+# Use -version-number to match the file name used before autoconfiscation. +# Use -version-number to match the file name used before autoconfiscation.
+libz_la_LDFLAGS = -version-number 1:2:3 -no-undefined +libz_la_LDFLAGS = -version-number 1:2:5 -no-undefined
+ +
+include_HEADERS = zlib.h +include_HEADERS = zlib.h
+nodist_include_HEADERS = zconf.h +nodist_include_HEADERS = zconf.h
@ -76,7 +79,7 @@ diff -urN zlib-1.2.3.orig/configure.ac zlib-1.2.3.kasal/configure.ac
+# -*- Autoconf -*- +# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script. +# Process this file with autoconf to produce a configure script.
+ +
+AC_INIT([zlib], [1.2.3], [bugzilla.redhat.com]) +AC_INIT([zlib], [1.2.5], [bugzilla.redhat.com])
+AC_CONFIG_SRCDIR([minigzip.c]) +AC_CONFIG_SRCDIR([minigzip.c])
+AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign])
@ -84,7 +87,7 @@ diff -urN zlib-1.2.3.orig/configure.ac zlib-1.2.3.kasal/configure.ac
+ +
+AC_SUBST([HAVE_UNISTD_H], [0]) +AC_SUBST([HAVE_UNISTD_H], [0])
+AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) +AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])
+AC_CONFIG_FILES([Makefile minizip.pc zconf.h:zconf.in.h]) +AC_CONFIG_FILES([Makefile minizip.pc zconf.h:zconf.h.in])
+AC_OUTPUT +AC_OUTPUT
diff -urN zlib-1.2.3.orig/minizip.pc.in zlib-1.2.3.kasal/minizip.pc.in 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.orig/minizip.pc.in 1970-01-01 01:00:00.000000000 +0100
@ -101,15 +104,3 @@ diff -urN zlib-1.2.3.orig/minizip.pc.in zlib-1.2.3.kasal/minizip.pc.in
+Version: @PACKAGE_VERSION@ +Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lminizip -lz +Libs: -L${libdir} -lminizip -lz
+Cflags: -I${includedir} +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

55
mingw32-zlib.spec
View File

@ -1,26 +1,26 @@
%define __strip %{_mingw32_strip} %global __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump} %global __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0 %global _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires} %global __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides} %global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-zlib Name: mingw32-zlib
Version: 1.2.3 Version: 1.2.5
Release: 19%{?dist} Release: 1%{?dist}
Summary: MinGW Windows zlib compression library Summary: MinGW Windows zlib compression library
License: zlib License: zlib
Group: Development/Libraries Group: Development/Libraries
URL: http://www.zlib.net/ URL: http://www.zlib.net/
Source0: http://www.zlib.net/zlib-%{version}.tar.gz Source0: http://www.zlib.net/zlib-%{version}.tar.gz
Patch3: zlib-1.2.3-autotools.patch # Replace the zlib build system with an autotools based one
Patch6: minizip-1.2.3-malloc.patch Patch3: mingw32-zlib-1.2.5-autotools.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=591317
Patch4: zlib-1.2.5-gentoo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
# MinGW-specific patches.
Patch100: zlib-win32.patch
BuildRequires: mingw32-filesystem >= 49 BuildRequires: mingw32-filesystem >= 49
BuildRequires: mingw32-gcc BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils BuildRequires: mingw32-binutils
@ -34,36 +34,38 @@ BuildRequires: libtool
MinGW Windows zlib compression library. MinGW Windows zlib compression library.
%package static %package static
Summary: Static libraries for mingw32-zlib development. Summary: Static libraries for mingw32-zlib development.
Group: Development/Libraries Group: Development/Libraries
Requires: mingw32-zlib = %{version}-%{release} Requires: mingw32-zlib = %{version}-%{release}
%description static %description static
The mingw32-zlib-static package contains static library for mingw32-zlib development. The mingw32-zlib-static package contains static library for mingw32-zlib development.
%package -n mingw32-minizip %package -n mingw32-minizip
Summary: Minizip manipulates files from a .zip archive Summary: Minizip manipulates files from a .zip archive
Group: Development/Libraries Group: Development/Libraries
Requires: mingw32-zlib = %{version}-%{release} Requires: mingw32-zlib = %{version}-%{release}
%description -n mingw32-minizip %description -n mingw32-minizip
MinGW Minizip manipulates files from a .zip archive. MinGW Minizip manipulates files from a .zip archive.
%{?_mingw32_debug_package}
%prep %prep
%setup -q -n zlib-%{version} %setup -q -n zlib-%{version}
%patch100 -p1
cd .. cd ..
cp -a zlib-%{version} x cp -a zlib-%{version} x
mv x zlib-%{version} mv x zlib-%{version}
cd zlib-%{version} cd zlib-%{version}
%patch3 -p1 -b .atools %patch3 -p1 -b .atools
%patch4 -p1 -b .g
# patch cannot create an empty dir # patch cannot create an empty dir
mkdir m4 mkdir m4
%patch6 -p1 -b .mal #cp minigzip.c contrib/minizip
iconv -f windows-1252 -t utf-8 <ChangeLog >ChangeLog.tmp iconv -f windows-1252 -t utf-8 <ChangeLog >ChangeLog.tmp
mv ChangeLog.tmp ChangeLog #mv ChangeLog.tmp ChangeLog
cp Makefile Makefile.old
%build %build
pushd x pushd x
@ -71,6 +73,7 @@ CC=%{_mingw32_cc} \
CFLAGS="%{_mingw32_cflags}" \ CFLAGS="%{_mingw32_cflags}" \
RANLIB=%{_mingw32_ranlib} \ RANLIB=%{_mingw32_ranlib} \
./configure ./configure
#LDSHAREDLIBC="" \
make -f win32/Makefile.gcc \ make -f win32/Makefile.gcc \
CFLAGS="%{_mingw32_cflags}" \ CFLAGS="%{_mingw32_cflags}" \
@ -110,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root,-)
%{_mingw32_includedir}/zconf.h %{_mingw32_includedir}/zconf.h
%{_mingw32_includedir}/zlib.h %{_mingw32_includedir}/zlib.h
%{_mingw32_libdir}/libz.dll.a %{_mingw32_libdir}/libz.dll.a
@ -119,13 +122,12 @@ rm -rf $RPM_BUILD_ROOT
%files static %files static
%defattr(-,root,root) %defattr(-,root,root,-)
%{_mingw32_libdir}/libz.a %{_mingw32_libdir}/libz.a
%files -n mingw32-minizip %files -n mingw32-minizip
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc contrib/minizip/ChangeLogUnzip
%{_mingw32_libdir}/libminizip.dll.a %{_mingw32_libdir}/libminizip.dll.a
%{_mingw32_libdir}/libminizip.la %{_mingw32_libdir}/libminizip.la
%{_mingw32_bindir}/libminizip-1.dll %{_mingw32_bindir}/libminizip-1.dll
@ -135,6 +137,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sun Sep 12 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.2.5-1
- Update to 1.2.5
- Use %%global instead of %%define
- Automatically generate debuginfo subpackage
- Use correct %%defattr tag
- Merged the changes from the native Fedora package
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-19 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

15
minizip-1.2.3-malloc.patch
View File

@ -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] == '/') {

2
sources
View File

@ -1 +1 @@
debc62758716a169df9f62e6ab2bc634 zlib-1.2.3.tar.gz c735eab2d659a96e5a594c9e8541ad63 zlib-1.2.5.tar.gz

12
zlib-1.2.5-gentoo.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up zlib-1.2.5/zlib.h.pom zlib-1.2.5/zlib.h
--- zlib-1.2.5/zlib.h.pom 2010-04-20 06:12:48.000000000 +0200
+++ zlib-1.2.5/zlib.h 2010-06-16 13:08:59.000000000 +0200
@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
# define gzoffset gzoffset64
# define adler32_combine adler32_combine64
# define crc32_combine crc32_combine64
-# ifdef _LARGEFILE64_SOURCE
+# ifndef _LARGEFILE64_SOURCE
ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));

41
zlib-win32.patch
View File

@ -1,41 +0,0 @@
diff -rup zlib-1.2.3.orig/win32/Makefile.gcc zlib-1.2.3.new/win32/Makefile.gcc
--- zlib-1.2.3.orig/win32/Makefile.gcc 2003-08-01 23:49:00.000000000 -0400
+++ zlib-1.2.3.new/win32/Makefile.gcc 2008-09-02 08:24:44.000000000 -0400
@@ -45,6 +45,9 @@ ARFLAGS = rcs
RC = windres
RCFLAGS = --define GCC_WINDRES
+DLLWARP = dllwrap
+STRIP = strip
+
CP = cp -fp
# If GNU install is available, replace $(CP) with install.
INSTALL = $(CP)
@@ -79,9 +82,9 @@ $(STATICLIB): $(OBJS) $(OBJA)
$(IMPLIB): $(SHAREDLIB)
$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
- dllwrap --driver-name $(CC) --def win32/zlib.def \
+ $(DLLWRAP) --driver-name $(CC) --def win32/zlib.def \
--implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o
- strip $@
+ $(STRIP) $@
example: example.o $(STATICLIB)
$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
@@ -104,12 +107,13 @@ zlibrc.o: win32/zlib1.rc
.PHONY: install uninstall clean
install: zlib.h zconf.h $(LIB)
- -@if not exist $(INCLUDE_PATH)/nul mkdir $(INCLUDE_PATH)
- -@if not exist $(LIBRARY_PATH)/nul mkdir $(LIBRARY_PATH)
+ -mkdir -p $(INCLUDE_PATH)
+ -mkdir -p $(LIBRARY_PATH)
-$(INSTALL) zlib.h $(INCLUDE_PATH)
-$(INSTALL) zconf.h $(INCLUDE_PATH)
-$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
-$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)
+ -$(INSTALL) $(SHAREDLIB) $(BINARY_PATH)
uninstall:
-$(RM) $(INCLUDE_PATH)/zlib.h