Fix Merge-Review problems

8 files changed, 22 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index eb6c867..23e0d91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-pybugz-0.10git69cd7/
+pybugz-*/
 noarch
 *.src.rpm
+*.tar.gz
 review-pybugz
diff --git a/prepare-tarball.sh b/prepare-tarball.sh
index a75c61a..84e7b02 100755
--- a/prepare-tarball.sh
+++ b/prepare-tarball.sh
@@ -2,20 +2,19 @@
 
 # grep the spec file for version number
 VERSION=$( cat pybugz.spec | grep ^Version: | cut -d' ' -f 2- | tr -d ' ')
+REV=$( cat pybugz.spec | grep '%global gitrev' | cut -d' ' -f 3- | tr -d ' ')
 
-BASE=pybugz-$VERSION
+BASE="pybugz-${VERSION}-git${REV}"
 TARBALL=$BASE.tar.gz
 DIR=$( mktemp -d )
 GIT=https://github.com/williamh/pybugz.git
 
-REVISION=`echo $VERSION | sed 's/.*git//'`
-
 echo == preparing tarball for pybugz-$VERSION ==
 
 pushd $DIR > /dev/null                                                  && \
 git clone $GIT pybugz                                                   && \
 cd pybugz                                                               && \
-git archive --prefix pybugz-$VERSION/ $REVISION | gzip > $TARBALL       && \
+git archive --prefix $BASE/ $REV | gzip > $TARBALL                      && \
 popd > /dev/null                                                        && \
 cp $DIR/pybugz/$TARBALL .                                               && \
 echo == DONE ==                                                         && \
diff --git a/pybugz-0.10-1.git69cd7.fc17.src.rpm b/pybugz-0.10-1.git69cd7.fc17.src.rpm
new file mode 100644
index 0000000..556985b
--- /dev/null
+++ b/pybugz-0.10-1.git69cd7.fc17.src.rpm
diff --git a/pybugz-0.10git69cd7-downstream.patch b/pybugz-0.10-git69cd7-downstream.patch
index ee34dd6..ee34dd6 100644
--- a/pybugz-0.10git69cd7-downstream.patch
+++ b/pybugz-0.10-git69cd7-downstream.patch
diff --git a/pybugz-0.10git69cd7-rhel-fedora-cust.patch b/pybugz-0.10-git69cd7-rhel-fedora-cust.patch
index 8a05846..8a05846 100644
--- a/pybugz-0.10git69cd7-rhel-fedora-cust.patch
+++ b/pybugz-0.10-git69cd7-rhel-fedora-cust.patch
diff --git a/pybugz-0.10git69cd7-1.fc17.src.rpm b/pybugz-0.10git69cd7-1.fc17.src.rpm
deleted file mode 100644
index 7ab5b60..0000000
--- a/pybugz-0.10git69cd7-1.fc17.src.rpm
+++ /dev/null
diff --git a/pybugz-0.10git69cd7.tar.gz b/pybugz-0.10git69cd7.tar.gz
deleted file mode 100644
index f121ab9..0000000
--- a/pybugz-0.10git69cd7.tar.gz
+++ /dev/null
diff --git a/pybugz.spec b/pybugz.spec
index d35f2b8..28af878 100644
--- a/pybugz.spec
+++ b/pybugz.spec
@@ -1,7 +1,11 @@
+%global gitrev 69cd7
+%global posttag git%{gitrev}
+%global snapshot %{version}-%{posttag}
+
 Name:       pybugz
 Summary:    Command line interface for Bugzilla written in Python
-Version:    0.10git69cd7
-Release:    1%{?dist}
+Version:    0.10
+Release:    1.%{posttag}%{?dist}
 Group:      Applications/Communications
 License:    GPLv2
 URL:        https://github.com/williamh/pybugz
@@ -10,9 +14,6 @@ BuildArch:  noarch
 Requires:       python2
 BuildRequires:  python2-devel
 
-# we don't need debuginfo package
-%global debug_package %{nil}
-
 %if ! 0%{?rhel}
 # no bash-completion for RHEL
 %global bash_completion 1
@@ -25,12 +26,12 @@ BuildRequires: bash-completion pkgconfig
 # There is possible to download upstream tarball generated by github, but it is
 # quite old now.  For HOWTO obtain correct tarball see the "prepare-tarball.sh"
 # script.
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-%{snapshot}.tar.gz
 
 # follow https://github.com/praiskup/pybugz changes (until accepted by upstream)
-Patch0: %{name}-%{version}-downstream.patch
+Patch0: %{name}-%{snapshot}-downstream.patch
 # make the installation better satisfy RHEL / Fedora purposes
-Patch1: %{name}-%{version}-rhel-fedora-cust.patch
+Patch1: %{name}-%{snapshot}-rhel-fedora-cust.patch
 
 %description
 Pybugz was conceived as a tool to speed up the work-flow for Gentoo Linux
@@ -40,7 +41,7 @@ quickly.  Developers alike can easily extract attachments and close bugs
 comfortably from the command line.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{snapshot}
 %patch0 -p1 -b .downstream
 %patch1 -p1 -b .rhel-fedora-cust
 
@@ -55,7 +56,7 @@ comfortably from the command line.
 %if %{?bash_completion}
   # find the proper directory to install bash-completion script
   mkdir -p %{buildroot}%{bash_cmpl_dir}
-  cp %{_builddir}/%{name}-%{version}/contrib/bash-completion \
+  cp %{_builddir}/%{name}-%{snapshot}/contrib/bash-completion \
      %{buildroot}%{bash_cmpl_dir}/bugz
 %endif
 
@@ -77,6 +78,12 @@ mkdir -p %{buildroot}%{_docdir}
 %doc README LICENSE
 
 %changelog
+* Sun Jan 20 2013 Pavel Raiskup <praiskup@redhat.com> - 0.10-1.git69cd7
+- changes for problems spotted/fixed by Scott Tsai in merge-review bug:
+- important change - move git revision behind the release number
+- reflect that ^^^ change in changelog
+- remove statement disabling debuginfo (it is not needed)
+
 * Sun Jan 20 2013 Pavel Raiskup <praiskup@redhat.com> - 0.10git69cd7-1
 - apply downstream patches to reflect https://github.com/praiskup/pybugz
   it allows hierarchy of configuration files and a bit better error handling