rpms/R-hdf5/EL-5 R-hdf5.spec,1.4,1.5

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/R-hdf5/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17407/EL-5

Modified Files:
	R-hdf5.spec 
Log Message:

Rebuild for ppc32, fix license tags



Index: R-hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/R-hdf5/EL-5/R-hdf5.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- R-hdf5.spec	5 Jul 2007 14:58:15 -0000	1.4
+++ R-hdf5.spec	26 Aug 2007 22:56:31 -0000	1.5
@@ -3,47 +3,54 @@
 
 Name: R-%{packname}
 Version: 1.6.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
-License: GPL
+License: GPLv2+
 URL: http://cran.r-project.org/contrib
 Group: Applications/Engineering
 Summary: Interface to the NCSA HDF5 library
 BuildRequires: R-devel, tetex-latex, hdf5-devel, zlib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post): R
+Requires(postun): R
 
 %description
 R package:
 Interface to the NCSA HDF5 library
 
 %prep
-%setup -T -c -a 0
+%setup -q -c -n %{packname}
 
 %build
-cp %{packname}/DESCRIPTION .
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
-%{_bindir}/R CMD check %{packname}
+%{_bindir}/R CMD INSTALL --configure-flags="PKG_CPPFLAGS=\"$RPM_OPT_FLAGS -Dspot\"" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+# Clean up in advance of check
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
 
+%check
+%{_bindir}/R CMD check %{packname}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt
+%{_R_make_search_index}
 
 %postun
-cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt
+%{_R_make_search_index}
 
 %files
-%doc DESCRIPTION
 %{_libdir}/R/library/%{packname}
 
 %changelog
+* Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.6-2
+- rebuild for ppc32
+- fix license tags
+
 * Thu Jul  5 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.6-1
 - bump to 1.6.6