Upstream 1.20 with a twist

This is what happens when I drop the ball on upstream reviews:
a Debian guy puts an ugly workaround for Debian brokenness that
blows up elsewhere. Then we add a workaround for his workaround.

This stuff is to be undone in the next upstream relaase hopefuly.
Working on it.

2 files changed, 48 insertions, 7 deletions

diff --git a/git-review-1.20-mansetup.patch b/git-review-1.20-mansetup.patch
new file mode 100644
index 0000000..985e3f4
--- /dev/null
+++ b/git-review-1.20-mansetup.patch
@@ -0,0 +1,29 @@
+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(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 3f108d4..b7f4aca 100644
--- a/git-review.spec
+++ b/git-review.spec
@@ -1,17 +1,18 @@
 Name:		git-review
-Version:	1.18
-Release:	2%{?dist}
+Version:	1.20
+Release:	0.1%{?dist}
 Summary:	A git helper for integration with Gerrit
 
 Group:		Development/Tools
 License:	ASL 2.0
-URL:		https://github.com/openstack-ci/git-review
-# Source URL is https://github.com/openstack-ci/git-review/tarball/{version},
+URL:		https://github.com/openstack-infra/git-review
+# Source URL is https://github.com/openstack-infra/git-review/archive/{version},
 # which produces  Content-Disposition: attachment; filename=XXXXXX.tar.gz.
-# But wait! The extracted directory name is different from tarball name.
-Source0:	openstack-ci-git-review-1.18-0-ge20ad53.tar.gz
+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
@@ -23,7 +24,9 @@ An extension for source control system git that creates and manages review
 requests in the patch management system Gerrit. It replaces the rfc.sh script.
 
 %prep
-%setup -q -n openstack-ci-git-review-7930bc0
+%setup -q
+
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -39,6 +42,10 @@ cp %{SOURCE1} %{buildroot}%{_sysconfdir}/git-review/
 # We do not save ".gitreview" as dot.gitreview because the man page has it too.
 # 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
+
 %clean
 rm -rf %{buildroot}
 
@@ -57,6 +64,11 @@ rm -rf %{buildroot}
 %doc README.md
 
 %changelog
+* Thu Mar 21 2013 Pete Zaitcev <zaitcev@redhat.com>
+- 1.20-0.1
+- Upstream 1.20: can have a file called "HEAD"; add -d option
+- Patch the breakage with manpage in setup.py (temporarily - upstream pending)
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild