Author: qboosh                       Date: Sun Feb 27 21:50:28 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 4.2r1, updated shared,opt patches, added nosz patch
- added szip bcond (on by default)

---- Files affected:
SPECS:
   hdf.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/hdf.spec
diff -u SPECS/hdf.spec:1.27 SPECS/hdf.spec:1.28
--- SPECS/hdf.spec:1.27 Tue Aug 31 16:44:50 2004
+++ SPECS/hdf.spec      Sun Feb 27 22:50:22 2005
@@ -1,18 +1,23 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without szip    # build without SZIP support
+#
 Summary:       Hierarchical Data Format library
 Summary(pl):   Biblioteka HDF (Hierarchical Data Format)
 Name:          hdf
-Version:       4.2r0
+Version:       4.2r1
 Release:       1
 Group:         Libraries
 License:       Nearly BSD, but changed sources must be marked
 Source0:       
ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz
-# Source0-md5: 3cede01c62864f5a902ef8e06a525aae
+# Source0-md5: 9082c6fa913b9188452fa6c5217e1573
 Source1:       
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5: 607df78cacc131b37dfdb443e61e789a
 Patch0:                %{name}-shared.patch
 Patch1:                %{name}-opt.patch
 Patch2:                %{name}-morearchs.patch
+Patch3:                %{name}-nosz.patch
 URL:           http://hdf.ncsa.uiuc.edu/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -22,6 +27,7 @@
 BuildRequires: groff
 BuildRequires: libjpeg-devel >= 6b
 BuildRequires: libtool >= 2:1.4d-3
+%{?with_szip:BuildRequires:    szip-devel >= 2.0}
 BuildRequires: which
 BuildRequires: zlib-devel >= 1.1.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,8 +61,9 @@
 Summary(pl):   Pliki nagłówkowe biblioteki HDF
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libjpeg-devel
-Requires:      zlib-devel
+Requires:      libjpeg-devel >= 6b
+%{?with_szip:Requires: szip-devel >= 2.0}
+Requires:      zlib-devel >= 1.1.3
 
 %description devel
 Header files for HDF library.
@@ -93,6 +100,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %ifarch ppc ppc64 sparc sparcv9 sparc64
 %{__perl} -pi -e 's/^SWAP.*$/SWAP=/' config/mh-linux
@@ -105,7 +113,8 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       %{?with_szip:--with-szlib}
 
 %{__make}
 
@@ -147,8 +156,6 @@
 %attr(755,root,root) %{_libdir}/libmfhdf.so
 %{_libdir}/libdf.la
 %{_libdir}/libmfhdf.la
-# static-only stub
-%{_libdir}/libudport.a
 %{_includedir}/hdf
 %{_mandir}/man[37]/*
 
@@ -168,6 +175,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2005/02/27 21:50:22  qboosh
+- updated to 4.2r1, updated shared,opt patches, added nosz patch
+- added szip bcond (on by default)
+
 Revision 1.27  2004/08/31 14:44:50  snurf
 - typos / formatting / etc.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hdf.spec?r1=1.27&r2=1.28&f=u


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to