[datanommer-commands] Latest upstream from Jessica Anderson.

[Ralph Bean]

commit 9b138e87b42b22f5e4031b18fc3b5dc0c6637277
Author: Ralph Bean <rbean at redhat.com>
Date:   Thu Feb 7 14:39:56 2013 -0500

    Latest upstream from Jessica Anderson.

 .gitignore               |    1 +
 datanommer-commands.spec |   36 +++++++++++++++++++++++++++++++-----
 sources                  |    2 +-
 3 files changed, 33 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1ffea8a..3601080 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /datanommer.commands-0.2.0.tar.gz
+/datanommer.commands-0.4.1.tar.gz
diff --git a/datanommer-commands.spec b/datanommer-commands.spec
index 6aa221c..f1b6bc1 100644
--- a/datanommer-commands.spec
+++ b/datanommer-commands.spec
@@ -1,8 +1,8 @@
 %global modname datanommer.commands
 
 Name:           datanommer-commands
-Version:        0.2.0
-Release:        4%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Console commands for datanommer
 
 Group:          Development/Libraries
@@ -15,19 +15,34 @@ BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-nose
+BuildRequires:  python-mock
 
-BuildRequires:  python-datanommer-models
+BuildRequires:  python-datanommer-models >= 0.4.1
+BuildRequires:  python-fedmsg-meta-fedora-infrastructure
 BuildRequires:  fedmsg
 
-Requires:       python-datanommer-models
+Requires:       python-datanommer-models >= 0.4.1
+Requires:       python-fedmsg-meta-fedora-infrastructure
 Requires:       fedmsg
 
+%if %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:    python-sqlalchemy0.7
+Requires:         python-sqlalchemy0.7
+%else
+BuildRequires:    python-sqlalchemy >= 0.7
+Requires:         python-sqlalchemy >= 0.7
+%endif
+
 %description
 Console commands for datanommer.
 
 %prep
 %setup -q -n %{modname}-%{version}
 
+# Make sure that epel/rhel picks up the correct version of sqlalchemy
+%{__awk} 'NR==1{print "import __main__; __main__.__requires__ = __requires__ = [\"sqlalchemy>=0.7\"]; import pkg_resources"}1' setup.py > setup.py.tmp
+%{__mv} setup.py.tmp setup.py
+
 # Remove upstream egg-info so that it gets rebuilt.
 rm -rf *.egg-info
 
@@ -38,7 +53,7 @@ rm -rf *.egg-info
 %{__python} setup.py install -O1 --skip-build --root=%{buildroot}
 
 %check
-%{__python} setup.py test
+PYTHONPATH=$(pwd) nosetests
 
 %files
 %doc README.rst LICENSE
@@ -46,15 +61,26 @@ rm -rf *.egg-info
 %{python_sitelib}/%{modname}-%{version}*
 
 %{_bindir}/datanommer-create-db
+%{_bindir}/datanommer-latest
 %{_bindir}/datanommer-stats
 %{_bindir}/datanommer-dump
 
 %changelog
+* Thu Feb 07 2013 Ralph Bean <rbean at redhat.com> - 0.4.1-1
+- Latest upstream from Jessica Anderson.
+- Various enhancements and bugfixes.
+- New datanommer-latest command.
+- Tests now require python-mock.
+- New dep on fedmsg.meta Fedora Infrastructure plugin.
+
 * Mon Oct 22 2012 Ralph Bean <rbean at redhat.com> - 0.2.0-4
 - Remove explicit versioned Conflicts with old datanommer.
+
 * Fri Oct 12 2012 Ralph Bean <rbean at redhat.com> - 0.2.0-3
 - Remove unnecessary CFLAGS definition.
+
 * Thu Oct 11 2012 Ralph Bean <rbean at redhat.com> - 0.2.0-2
 - Remove upstream egg-info so that its gets rebuilt.
+
 * Thu Oct 11 2012 Ralph Bean <rbean at redhat.com> - 0.2.0-1
 - Initial split out from the main datanommer package.
diff --git a/sources b/sources
index d6ca505..41bf0ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97a2dde7ac5081bf76dc3234f63d83ff  datanommer.commands-0.2.0.tar.gz
+4f4375d8697a9be1c85ec96b83c914bc  datanommer.commands-0.4.1.tar.gz