[R2spec/f14] Update to 4.0.0 Conflicts:

[Pierre-YvesChibon]

commit 5eed53e3a6740864182bf93392586303f8fac16e
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Sat Nov 12 20:50:34 2011 +0100

    Update to 4.0.0
    Conflicts:
    
    	R2spec.spec

 .gitignore  |    1 +
 R2spec.spec |   15 +++++++++++----
 sources     |    2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c4b178..ef355ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 R2spec-3.0.2.tar.gz
 R2spec-3.0.3.tar.gz
+/R2spec-4.0.0.tar.gz
diff --git a/R2spec.spec b/R2spec.spec
index 6d9a5af..2138430 100644
--- a/R2spec.spec
+++ b/R2spec.spec
@@ -3,6 +3,7 @@
 
 Name:           R2spec
 Version:        3.0.3
+Version:        4.0.0
 Release:        1%{?dist}
 Summary:        Python script to generate R spec file
 
@@ -23,7 +24,6 @@ It can work from a URL or a tarball.
 R2spec provides R2rpm which generates rpm for R libraries using the 
 R2spec API.
 
-
 %prep
 %setup -q
 
@@ -32,25 +32,32 @@ R2spec API.
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install --root=%{buildroot} 
+%{__python} setup.py install --root=%{buildroot}
 install r2spec/specfile.tpl %{buildroot}/%{python_sitelib}/r2spec/
 chmod -x %{buildroot}/%{python_sitelib}/r2spec/specfile.tpl
 
 %clean
 rm -rf %{buildroot}
 
-%files 
+## Only work localy, needs internet
+#%check
+#%{__python} tests.py
+
+%files
 #-f installed_files2
 %defattr(-,root,root,-)
 %doc README LICENSE CHANGELOG
 %{python_sitelib}/*
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/%{name}/repos.cfg
 %{_bindir}/%{name}
 %{_bindir}/R2rpm
 %{_mandir}/man1/%{name}.1.gz
 %{_mandir}/man1/R2rpm.1.gz
 
 %changelog
+* Sat Nov 12 2011 Pierre-Yves Chibon <pingou at pingoured.fr> - 4.0.0-1
+- Update to 4.0.0 which is an almost complete rewrite
+
 * Tue Jul 28 2010 pingou <pingou-at-pingoured.fr> 3.0.3-1
 - Release 3.0.3
 
diff --git a/sources b/sources
index d01e662..6adc223 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-484c3cf1ac95eaea130ecf7854e59abc  R2spec-3.0.3.tar.gz
+51ccff37b8a602e97baa3f5ace3f6126  R2spec-4.0.0.tar.gz