[rpms/rpkg] 1.70-1: New release 1.55

[rpms/rpkg] 1.70-1: New release 1.55

[Chenxiong Qi]

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 7c9c10d00afafa2e97957a05932299e5e051a861
            Author : Chenxiong Qi <cqi@redhat.com>
            Date   : 2018-07-23T22:23:43+08:00
            Stats  : +49/-23 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/7c9c10d00afafa2e97957a05932299e5e051a861?branch=1.70-1

            Log:
            New release 1.55

Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---
diff --git a/.gitignore b/.gitignore
index 635ad6d..b111eec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@
 /rpkg-1.52.tar.gz
 /rpkg-1.53.tar.gz
 /rpkg-1.54.tar.gz
+/rpkg-1.55.tar.gz

diff --git a/fix-argparse-version-for-el6.patch b/fix-argparse-version-for-el6.patch
deleted file mode 100644
index da56b90..0000000
--- a/fix-argparse-version-for-el6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpkg-1.54/setup.py.orig	2018-05-21 17:16:33.425149133 +0800
-+++ rpkg-1.54/setup.py	2018-05-21 17:16:59.240397138 +0800
-@@ -40,7 +40,7 @@
-     install_requires.remove('GitPython')
-     install_requires += [
-         'GitPython<1.0.0',
--        'argparse==1.4.0',
-+        'argparse',
-     ]
-     tests_require += [
-         'unittest2'

diff --git a/rpkg.spec b/rpkg.spec
index cc1dda1..544ea44 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -3,8 +3,8 @@
 %{!?__python2: %global __python2 %{__python}}
 
 Name:           rpkg
-Version:        1.54
-Release:        4%{?dist}
+Version:        1.55
+Release:        1%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
@@ -22,9 +22,6 @@ BuildArch:      noarch
 # remove rpm-py-installer for now.
 Patch0:         remove-koji-and-rpm-py-installer-from-requires.patch
 
-# In EPEL6, there is only older version rather than 1.4.0
-Patch1:         fix-argparse-version-for-el6.patch
-
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 # Enable python3 build by default
@@ -177,18 +174,15 @@ Common files for python2-%{name} and python3-%{name}.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 
 %build
 %if 0%{?with_python2}
 %{__python2} setup.py build
-%{__python2} doc/rpkg_man_page.py > rpkg.1
 %endif
 
 %if 0%{?with_python3}
 %py3_build
-%{__python3} doc/rpkg_man_page.py > rpkg.1
 %endif
 
 
@@ -218,9 +212,6 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
 %{__install} -p -m 0644 etc/bash_completion.d/rpkg.bash ${example_cli_dir}%{_sysconfdir}/bash_completion.d
 %{__install} -p -m 0644 etc/rpkg/rpkg.conf ${example_cli_dir}%{_sysconfdir}/rpkg
 
-%{__install} -d ${example_cli_dir}%{_mandir}/man1
-%{__install} -p -m 0644 rpkg.1 ${example_cli_dir}%{_mandir}/man1
-
 
 %check
 # cannot use python2 -m nose on EPEL 6 (Python 2.6)
@@ -256,6 +247,51 @@ nosetests tests
 
 
 %changelog
+* Mon Jul 23 2018 Chenxiong Qi <cqi@redhat.com> - 1.55-1
+- Fix installing pycurl for running tests (cqi)
+- Replace extra module_name with repo_name (cqi)
+- Replace name module with repo in tests/fixtures/rpkg*.conf (cqi)
+- Add --fail-fast functionality - #331 (tibbs)
+- Fix fake spec for build in rawhide (cqi)
+- Avoid to upload a file with different checksum - #204 (cqi)
+- Give more information when sources has invalid content - #227 (cqi)
+- Reserve README.md while import srpm - #149 (cqi)
+- Set to repo_name property when --name is specified (cqi)
+- Do not restrict argparse version (cqi)
+- Check old format args only if there is clone config (cqi)
+- Fix typo and reword option help and deprecation message (cqi)
+- Massive replacement of module (cqi)
+- Deprecate module_name inside rpkg internal (cqi)
+- Add new option --name and --namespace - #301 (cqi)
+- Man generator indent workaround (onosek)
+- Fixing imports in unittests (onosek)
+- Minor fixes to doc build (cqi)
+- Fix mistakes during rebase (cqi)
+- Run document generator script in Py3 explictly (cqi)
+- Remove warning of nonexisting source/_static/ during doc build (cqi)
+- Do not generate document for sample rpkg app (cqi)
+- Exclude subcommand which does not have help (cqi)
+- Ensure to clean files for generating HTML documents (cqi)
+- Fix rebase error: add module_build_watch back (cqi)
+- Fix MANIFEST.in to list files for building doc (cqi)
+- Rename generate_man_pages.py (cqi)
+- Generate HTML document and manpage for sample rpkg (cqi)
+- Simplify doc Makefile (cqi)
+- Generate commands HTML and man pages (cqi)
+- Update existing docstrings (cqi)
+- Generate documents by sphinx - #50 (cqi)
+- README: new code should be py3 compatible (ktdreyer)
+- Provide base_module to clone_config templates - #326 (tmz)
+- Refactor man generator to be reusable (puiterwijk)
+- Make sure gitcred doesn't land in man (puiterwijk)
+- Don't inject the credential helper to push if OIDC is unconfigured
+  (puiterwijk)
+- Add docblocks to gitcred methods and don't quit if OpenIDC is unconfigured
+  (puiterwijk)
+- Also inject the credential helper with rpkg push (puiterwijk)
+- Create a "gitcred" command that functions as an OIDC git-credential helper
+  (puiterwijk)
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.54-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

diff --git a/sources b/sources
index 69b38e6..ce08724 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpkg-1.54.tar.gz) = b0a281c1297f2348ba504563d7ff8d32229de7b71cb2d812220a0e024abc8c8175ce19f034ed0f9b358a1f591b75d818972f58ce94f8838e2e9161f7ac913700
+SHA512 (rpkg-1.55.tar.gz) = 52d25c75d0bf6443a61307210f89cfdfa8b64f9a1c32208dec04f52bf73a2adc4101ace703531276baf0cd043f8af10acf2719fe00ef2e89dfb26c086a99dda4