[rpms/rpkg] 1.70-1: Merge branch 'master' into f17

[Jesse Keating <jkeating@redhat.com>]

A new commit has been pushed.

Repo   : rpms/rpkg
Branch : 1.70-1
Commit : 025e54acd3c2a11c38200a2f1645d983e3577a74
Author : Jesse Keating <jkeating@redhat.com>
Date   : 2012-03-21T16:57:37-07:00
Stats  : +7/-2 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/rpkg/c/025e54acd3c2a11c38200a2f1645d983e3577a74?branch=1.70-1

Log:
Merge branch 'master' into f17

---
diff --git a/.gitignore b/.gitignore
index 3b7f087..b2cecb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /rpkg-1.12.tar.gz
 /rpkg-1.13.tar.gz
 /rpkg-1.14.tar.gz
+/rpkg-1.15.tar.gz

diff --git a/rpkg.spec b/rpkg.spec
index ae0948c..560f48f 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           rpkg
-Version:        1.14
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Utility for interacting with rpm+git packaging systems
 
@@ -77,6 +77,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 21 2012 Jesse Keating <jkeating@redhat.com> - 1.15-1
+- Fix branch push warning (jkeating)
+- Handle CVS based builds when getting build hash (jkeating)
+
 * Mon Mar 12 2012 Jesse Keating <jkeating@redhat.com> - 1.14-1
 - Warn if the checked out branch cannot be pushed (jkeating)
 - Warn if commit or tag fails and we don't push (#21) (jkeating)

diff --git a/sources b/sources
index cd0656d..379bc6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fbbfe944c40b3453e9ebe29920938bd  rpkg-1.14.tar.gz
+c5ce66c83e171eb12e77915e27e851c4  rpkg-1.15.tar.gz