[R-timeDate/f14] Update to 2130.93
Pierre-YvesChibon
pingou at fedoraproject.org
Wed Jun 22 18:32:55 UTC 2011
commit d9c3192f5ab7a0742917fe576cc050d4bd64e1b9
Author: pingou <pingou at pingoured.fr>
Date: Wed Jun 22 20:32:40 2011 +0200
Update to 2130.93
.gitignore | 5 +++++
R-timeDate.spec | 8 +++++---
sources | 4 ++++
3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9613a19..fa47a60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
timeDate_2120.90.tar.gz
+<<<<<<< HEAD
+=======
+/timeDate_2130.92.tar.gz
+/timeDate_2130.93.tar.gz
+>>>>>>> b606e68... Update to 2130.93
diff --git a/R-timeDate.spec b/R-timeDate.spec
index d45f81f..104f7eb 100644
--- a/R-timeDate.spec
+++ b/R-timeDate.spec
@@ -1,8 +1,8 @@
%global packname timeDate
Name: R-%{packname}
-Version: 2120.90
-Release: 1%{?dist}
+Version: 2130.93
+Release: 1%{dist}
Summary: Rmetrics - chronological and calendrical objects
Group: Applications/Engineering
@@ -53,7 +53,6 @@ rm -rf %{buildroot}
# noarch
%dir %{_datadir}/R/library/%{packname}/
-%doc %{_datadir}/R/library/%{packname}/doc/
%doc %{_datadir}/R/library/%{packname}/html/
%doc %{_datadir}/R/library/%{packname}/DESCRIPTION
%doc %{_datadir}/R/library/%{packname}/COPYRIGHT.html
@@ -66,6 +65,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Jun 22 2011 pingou <pingou at pingoured.fr> 2130.93-1
+- Update to version 2130.93
+
* Mon Jul 26 2010 Sandro Mathys <red at fedoraproject.org> - 2120.90-1
- new upstream version
diff --git a/sources b/sources
index 7cc0a84..e1685ee 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
e58ddea72b1e09c71ab8d452988a6700 timeDate_2120.90.tar.gz
+=======
+b5d14f7c2c7bd1c813db0201eab75cb4 timeDate_2130.93.tar.gz
+>>>>>>> b606e68... Update to 2130.93
More information about the scm-commits
mailing list