[Zlib-devel] zlib 1.2.0.3 available for testing -- RELEASE CANDIDATE

[Jeff Johnson]

On Tue, Jul 22, 2003 at 11:26:51AM -0700, Mark Adler wrote:
> On Tuesday, July 22, 2003, at 10:52  AM, Jeff Johnson wrote:
> > OK to drop this into Red Hat rawhide?
> 
> Jeff,
> 
> No, not quite yet.  I'd like to wait one more revision, and then it 
> should be ready.
> 

OK, ready when you are. Builds fine locally, will know more when I
merge into the devel branch of rpm this evening, and when I build
on the 7 supported platforms.

I don't expect any problems, *nix is easy ;-)

Attached is the one patch that is currently being carried in the Red Hat
package.

Also attached is a "no-brainer" spec file. If you were to add to your
tarball, then rpm users would be able to do
	rpmbuild -ta zlib-1.2.0.3.tar.gz
which sometimes speeds up packaging.

OTOH, most everyone wants to change something in the spec file, so including
the spec file in the tarball is often pointless.

Your call, my job is to deliver patches and suggestions upstream ;-)

73 de Jeff

-- 
Jeff Johnson	ARS N3NPQ
jbj at redhat.com (jbj at jbj.org)
Chapel Hill, NC
-------------- next part --------------
--- zlib-1.1.4/Makefile.in.jj	Mon Mar 11 08:58:30 2002
+++ zlib-1.1.4/Makefile.in	Fri Apr 26 06:53:12 2002
@@ -62,13 +62,16 @@ all: example minigzip
 
 test: all
 	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-	echo hello world | ./minigzip | ./minigzip -d || \
-	  echo '		*** minigzip test FAILED ***' ; \
+	ret=0; \
+	if ! echo hello world | ./minigzip | ./minigzip -d; then \
+	  echo '		*** minigzip test FAILED ***'; ret=1; \
+	fi; \
 	if ./example; then \
 	  echo '		*** zlib test OK ***'; \
 	else \
-	  echo '		*** zlib test FAILED ***'; \
-	fi
+	  echo '		*** zlib test FAILED ***'; ret=1; \
+	fi; \
+	exit $$ret
 
 libz.a: $(OBJS) $(OBJA)
 	$(AR) $@ $(OBJS) $(OBJA)
-------------- next part --------------
Summary: The zlib compression and decompression library.
Name: zlib
Version: 1.2.0.3
Release: 0.1
Group: System Environment/Libraries
Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz
URL: http://www.gzip.org/zlib/
License: BSD
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-root

%description
Zlib is a general-purpose, patent-free, lossless data compression
library which is used by many different programs.

%package devel
Summary: Header files and libraries for Zlib development.
Group: Development/Libraries
Requires: zlib = %{version}

%description devel
The zlib-devel package contains the header files and libraries needed
to develop programs that use the zlib compression and decompression
library.

%prep
%setup -q

%build

CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}

# now build the static lib
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_prefix}

CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
make install prefix=${RPM_BUILD_ROOT}%{_prefix}

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}
    mv ${RPM_BUILD_ROOT}%{_prefix}/lib/* ${RPM_BUILD_ROOT}%{_libdir}
    rmdir ${RPM_BUILD_ROOT}%{_prefix}/lib
fi

%clean
rm -rf ${RPM_BUILD_ROOT}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc README
%{_libdir}/libz.so.*

%files devel
%defattr(-,root,root)
%doc ChangeLog algorithm.txt minigzip.c example.c
%{_libdir}/*.a
%{_libdir}/*.so
%{_includedir}/*
%{_mandir}/man3/zlib.3*