rpms/R-wavethresh/devel .cvsignore, 1.3, 1.4 R-wavethresh.spec, 1.10, 1.11 sources, 1.3, 1.4

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/R-wavethresh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24337/devel

Modified Files:
	.cvsignore R-wavethresh.spec sources 
Log Message:
update to 2.2-11, fix versioning, scriptlets


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-wavethresh/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Sep 2006 13:07:24 -0000	1.3
+++ .cvsignore	28 Jul 2009 19:33:00 -0000	1.4
@@ -1 +1 @@
-wavethresh_2.2-9.tar.gz
+wavethresh_2.2-11.tar.gz


Index: R-wavethresh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-wavethresh/devel/R-wavethresh.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- R-wavethresh.spec	24 Jul 2009 16:16:15 -0000	1.10
+++ R-wavethresh.spec	28 Jul 2009 19:33:00 -0000	1.11
@@ -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 at 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 at lists.fedoraproject.org> - 2.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-wavethresh/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Sep 2006 13:07:24 -0000	1.3
+++ sources	28 Jul 2009 19:33:00 -0000	1.4
@@ -1 +1 @@
-a1c21183121fcfc379f438eaab506b10  wavethresh_2.2-9.tar.gz
+51985b435713a481b938c24dfd0bb4f3  wavethresh_2.2-11.tar.gz