Author: emes Date: Thu Oct 8 23:28:17 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- conditional build with zlib
- zlib disabled on x86_64 due to pointer bug
---- Files affected:
packages/libxml2:
libxml2.spec (1.170 -> 1.171)
---- Diffs:
================================================================
Index: packages/libxml2/libxml2.spec
diff -u packages/libxml2/libxml2.spec:1.170 packages/libxml2/libxml2.spec:1.171
--- packages/libxml2/libxml2.spec:1.170 Wed Oct 7 17:53:33 2009
+++ packages/libxml2/libxml2.spec Fri Oct 9 01:28:11 2009
@@ -3,6 +3,11 @@
# Conditional build:
%bcond_without python # don't build python module
%bcond_without static_libs # don't build static libraries
+%bcond_without zlib # don't use zlib
+#
+%ifarch x86_64
+%undefine with_zlib
+%endif
#
Summary: libXML library
Summary(es.UTF-8): Biblioteca libXML version 2
@@ -10,7 +15,7 @@
Summary(pt_BR.UTF-8): Biblioteca libXML versão 2
Name: libxml2
Version: 2.7.6
-Release: 1
+Release: 2
Epoch: 1
License: MIT
Group: Libraries
@@ -28,7 +33,7 @@
%{?with_python:BuildRequires: python-modules}
%{?with_python:BuildRequires: rpm-pythonprov}
BuildRequires: rpmbuild(macros) >= 1.219
-BuildRequires: zlib-devel
+%{?with_zlib:BuildRequires: zlib-devel}
# history support in xmllint is disabled by default
#BuildRequires: ncurses-devel
#BuildRequires: readline-devel >= 4.2
@@ -55,6 +60,7 @@
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: zlib-devel
+%{?with_zlib:BuildRequires: zlib-devel}
%description devel
Header files etc you can use to develop libxml2 applications.
@@ -134,7 +140,9 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%if %{with zlib}
%patch2 -p1
+%endif
%build
%{__libtoolize}
@@ -144,7 +152,8 @@
%{__automake}
%configure \
%{!?with_static_libs:--enable-static=no} \
- %{!?with_python:--without-python}
+ %{!?with_python:--without-python} \
+ %{!?with_zlib:--with-zlib=no}
%{__make}
@@ -245,6 +254,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.171 2009/10/08 23:28:11 emes
+- conditional build with zlib
+- zlib disabled on x86_64 due to pointer bug
+
Revision 1.170 2009/10/07 15:53:33 arekm
- up to 2.7.6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libxml2/libxml2.spec?r1=1.170&r2=1.171&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
