Update to 1.22

This mostly adds small improvements for projects ouside of OpenStack.
Also, there's now per-user configuration slash preferences.

My manpage fix-up is now upstream, so dropping the patch.

4 files changed, 11 insertions, 40 deletions

diff --git a/.gitignore b/.gitignore
index 476b128..4371f84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /openstack-ci-git-review-1.16-0-gda19131.tar.gz
 /openstack-ci-git-review-1.17-0-g776e800.tar.gz
 /openstack-ci-git-review-1.18-0-ge20ad53.tar.gz
+/git-review-1.22.tar.gz
diff --git a/git-review-1.20-mansetup.patch b/git-review-1.20-mansetup.patch
deleted file mode 100644
index 1751b73..0000000
--- a/git-review-1.20-mansetup.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 27765fb..4d0ef15 100755
---- a/setup.py
-+++ b/setup.py
-@@ -18,6 +18,7 @@ from setuptools import setup
- from distutils.command.install import install as du_install
- from setuptools.command.install import install
- import os.path
-+import sys
- 
- # version comes from git-review.
- savename = __name__
-@@ -35,13 +36,13 @@ class git_review_install(install):
- 
- git_review_cmdclass = {'install': git_review_install}
- 
--manpath = 'man'
--if os.path.realpath('/usr/local/man') == '/usr/local/share/man':
-+manpath = 'share/man'
-+if os.path.exists(os.path.join(sys.prefix,'man')):
-     # This works around a bug with install where it expects every node
-     # in the relative data directory to be an actual directory, since at
-     # least Debian derivatives (and probably other platforms as well)
-     # like to symlink Unixish /usr/local/man to /usr/local/share/man.
--    manpath = os.path.join('share', manpath)
-+    manpath = 'man'
- 
- setup(
-     name='git-review',
diff --git a/git-review.spec b/git-review.spec
index ce55400..b5a9f30 100644
--- a/git-review.spec
+++ b/git-review.spec
@@ -1,6 +1,6 @@
 Name:		git-review
-Version:	1.20
-Release:	0.2%{?dist}
+Version:	1.22
+Release:	1%{?dist}
 Summary:	A git helper for integration with Gerrit
 
 Group:		Development/Tools
@@ -11,8 +11,6 @@ URL:		https://github.com/openstack-infra/git-review
 Source0:	git-review-%{version}.tar.gz
 Source1:	git-review.conf
 
-Patch1:		git-review-1.20-mansetup.patch
-
 BuildArch:	noarch
 BuildRequires:	python2-devel
 BuildRequires:	python-setuptools
@@ -26,8 +24,6 @@ requests in the patch management system Gerrit. It replaces the rfc.sh script.
 %prep
 %setup -q
 
-%patch1 -p1
-
 %build
 %{__python} setup.py build
 sed -i 's/\r//' LICENSE
@@ -43,8 +39,8 @@ cp %{SOURCE1} %{buildroot}%{_sysconfdir}/git-review/
 # cp .gitreview #{buildroot}/usr/share/doc/dot.gitreview
 
 # The setup.py in git-review manages manpages.
-#install -d -m 755 %{buildroot}%{_mandir}/man1
-#install -p -m 0644 git-review.1 %{buildroot}%{_mandir}/man1
+#install -d -m 755 #{buildroot}#{_mandir}/man1
+#install -p -m 0644 git-review.1 #{buildroot}#{_mandir}/man1
 
 %clean
 rm -rf %{buildroot}
@@ -60,10 +56,13 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/git-review/git-review.conf
 # License is required in percent-doc according to Packaging:LicensingGuidelines
 %doc AUTHORS LICENSE
-# How about transforming README.md into HTML or something?
-%doc README.md
+%doc README.rst
 
 %changelog
+* Fri Aug 09 2013 Pete Zaitcev <zaitcev@redhat.com>
+- 1.22-1
+- Upstream 1.22: per-user configurations, tweaks to gerrit branch search
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.20-0.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index ca19cea..6e22d45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7c490b2bd61da7586e21077d55bde99  openstack-ci-git-review-1.18-0-ge20ad53.tar.gz
+e889df5838c059362e5e0d411bde9c48  git-review-1.22.tar.gz