From 280d20254c943d159efb814a6531588b601f3ccf Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 15:20:15 +0000
Subject: auto-import changelog data from zlib-1.2.0.7-2.src.rpm

Wed Oct 08 2003 Jeff Johnson <jbj@jbj.org> 1.2.0.7-2
- fix: gzeof not set when reading compressed file (#106424).
- fix: revert zlib.h include constants for now (#106291).
Tue Sep 23 2003 Jeff Johnson <jbj@redhat.com> 1.2.0.7-1
- update to 1.2.0.7, penultimate 1.2.1 release candidate.
Tue Jul 22 2003 Jeff Johnson <jbj@redhat.com> 1.2.0.3-0.1
- update to release candidate.
Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
Mon May 19 2003 Jeff Johnson <jbj@redhat.com> 1.1.4-9
- rebuild, revert from 1.2.0.1.

---

diff --git a/.cvsignore b/.cvsignore
index aac3f1e..f395133 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zlib-1.1.4.tar.gz
+zlib-1.2.0.7.tar.gz
diff --git a/sources b/sources
index d400e26..22b30d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abc405d0bdd3ee22782d7aa20e440f08  zlib-1.1.4.tar.gz
+d6c16e26c23f083b5860290eaba50214  zlib-1.2.0.7.tar.gz
diff --git a/zlib.spec b/zlib.spec
index 4bebf7a..bdb9765 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,12 +1,11 @@
 Summary: The zlib compression and decompression library.
 Name: zlib
-Version: 1.1.4
-Release: 8
+Version: 1.2.0.7
+Release: 2
 Group: System Environment/Libraries
 Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz
 Patch0: zlib-1.1.4-make-test.patch
-Patch1: zlib-1.1.4-use_cc.patch
-Patch2: zlib-1.1.4-vsnprintf.patch
+Patch1: zlib-1.2.0.7-jbj.patch
 URL: http://www.gzip.org/zlib/
 License: BSD
 Prefix: %{_prefix}
@@ -29,20 +28,19 @@ library.
 %prep
 %setup -q
 %patch0 -p1 -b .make-test
-%patch1 -p1 -b .use_cc
-%patch2 -p1 -b .vsnprintf
+%patch1 -p1 -b .jbj
 
 %build
 
 CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
-make %{?_smp_mflags} test
+
 # now build the static lib
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
-make %{?_smp_mflags} test
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3
 
 CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
 make install prefix=${RPM_BUILD_ROOT}%{_prefix}
@@ -51,8 +49,6 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
 make install prefix=${RPM_BUILD_ROOT}%{_prefix}
 
 install -m644 zutil.h ${RPM_BUILD_ROOT}%{_includedir}/zutil.h
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3
-install -m644 zlib.3 ${RPM_BUILD_ROOT}%{_mandir}/man3
 
 if [ "%{_prefix}/lib" != "%{_libdir}" ]; then
     mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
@@ -60,6 +56,9 @@ if [ "%{_prefix}/lib" != "%{_libdir}" ]; then
     rmdir ${RPM_BUILD_ROOT}%{_prefix}/lib
 fi
 
+%check
+make %{?_smp_mflags} test
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -81,6 +80,22 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/zlib.3*
 
 %changelog
+* Wed Oct  8 2003 Jeff Johnson <jbj@jbj.org> 1.2.0.7-2
+- fix: gzeof not set when reading compressed file (#106424).
+- fix: revert zlib.h include constants for now (#106291).
+
+* Tue Sep 23 2003 Jeff Johnson <jbj@redhat.com> 1.2.0.7-1
+- update to 1.2.0.7, penultimate 1.2.1 release candidate.
+
+* Tue Jul 22 2003 Jeff Johnson <jbj@redhat.com> 1.2.0.3-0.1
+- update to release candidate.
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Mon May 19 2003 Jeff Johnson <jbj@redhat.com> 1.1.4-9
+- rebuild, revert from 1.2.0.1.
+
 * Mon Feb 24 2003 Jeff Johnson <jbj@redhat.com> 1.1.4-8
 - fix gzprintf buffer overrun (#84961).