- fix bug 122408 - zlib build process runs configure twice
This commit is contained in:
parent
6eb4459de6
commit
cd1bb350b4
20
zlib.spec
20
zlib.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: The zlib compression and decompression library.
|
Summary: The zlib compression and decompression library.
|
||||||
Name: zlib
|
Name: zlib
|
||||||
Version: 1.2.2.2
|
Version: 1.2.2.2
|
||||||
Release: 2
|
Release: 3
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz
|
Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz
|
||||||
Patch0: zlib-1.1.4-make-test.patch
|
Patch0: zlib-1.1.4-make-test.patch
|
||||||
@ -29,22 +29,22 @@ library.
|
|||||||
%patch0 -p1 -b .make-test
|
%patch0 -p1 -b .make-test
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
|
CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
|
||||||
|
mv Makefile Makefile.shared
|
||||||
|
make -f Makefile.shared
|
||||||
|
|
||||||
# now build the static lib
|
# now build the static lib
|
||||||
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
|
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
|
||||||
|
mv Makefile Makefile.static
|
||||||
|
make -f Makefile.static
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf ${RPM_BUILD_ROOT}
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
|
mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
|
||||||
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3
|
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3
|
||||||
|
|
||||||
CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
|
make -f Makefile.shared install prefix=${RPM_BUILD_ROOT}%{_prefix}
|
||||||
make install prefix=${RPM_BUILD_ROOT}%{_prefix}
|
make -f Makefile.static 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
|
install -m644 zutil.h ${RPM_BUILD_ROOT}%{_includedir}/zutil.h
|
||||||
|
|
||||||
@ -55,7 +55,8 @@ if [ "%{_prefix}/lib" != "%{_libdir}" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make %{?_smp_mflags} test
|
make -f Makefile.shared %{?_smp_mflags} test
|
||||||
|
make -f Makefile.static %{?_smp_mflags} test
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf ${RPM_BUILD_ROOT}
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
@ -78,6 +79,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%{_mandir}/man3/zlib.3*
|
%{_mandir}/man3/zlib.3*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 30 2005 Ivana Varekova <varekova@redhat.com> 1.2.2.2-3
|
||||||
|
- fix bug 122408 - zlib build process runs configure twice
|
||||||
|
|
||||||
* Fri Mar 4 2005 Jeff Johnson <jbj@redhat.com> 1.2.2.2-2
|
* Fri Mar 4 2005 Jeff Johnson <jbj@redhat.com> 1.2.2.2-2
|
||||||
- rebuild with gcc4.
|
- rebuild with gcc4.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user