update to 2.2-11, fix versioning, scriptlets

.cvsignore

@@ -1 +1 @@
-wavethresh_2.2-9.tar.gz
+wavethresh_2.2-11.tar.gz

R-wavethresh.spec

@@ -1,13 +1,14 @@
-%define packrel  9
+%define packver  2.2
+%define packrel  11
 %define packname wavethresh
 
 Summary: R module, Software to perform wavelet statistics and transforms
 Name: R-%{packname}
-Version: 2.2
-Release: 11%{?dist}
+Version: %{packver}.%{packrel}
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Engineering
-Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz
+Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{packver}-%{packrel}.tar.gz
 URL: http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,10 +39,10 @@ cd ..;%{_bindir}/R CMD check %{packname}
 %{__rm} -rf %{buildroot}
 
 %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
 %defattr(-, root, root, -)
@@ -49,6 +50,11 @@ cd ..;%{_bindir}/R CMD check %{packname}
 %doc DESCRIPTION
 
 %changelog
+* Tue Jul 28 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.2.11-1
+- update to 2.2-11
+- use new versioning scheme that includes packrel
+- use proper scriptlets
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

sources

@@ -1 +1 @@
-a1c21183121fcfc379f438eaab506b10  wavethresh_2.2-9.tar.gz
+51985b435713a481b938c24dfd0bb4f3  wavethresh_2.2-11.tar.gz