[rpms/fedpkg] 1.48-1: New release 1.30

[rpms/fedpkg] 1.48-1: New release 1.30

[Chenxiong Qi]

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : 4566dba5cc49ffe2a434267cb37ed3eeb2abd00e
            Author : Chenxiong Qi <cqi@redhat.com>
            Date   : 2017-10-21T19:44:20+08:00
            Stats  : +38/-87 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/4566dba5cc49ffe2a434267cb37ed3eeb2abd00e?branch=1.48-1

            Log:
            New release 1.30

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

---
diff --git a/0001-Get-correct-build-target-for-rawhide-containers.patch b/0001-Get-correct-build-target-for-rawhide-containers.patch
deleted file mode 100644
index 0d6c454..0000000
--- a/0001-Get-correct-build-target-for-rawhide-containers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 204b1a464a0cea4b42c3b1ab7a6b001521142cb0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Tue, 12 Sep 2017 16:07:29 +0200
-Subject: [PATCH 1/2] Get correct build target for rawhide containers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The target is named `rawhide-`, not `master-`.
-
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
----
- fedpkg/__init__.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index 4b6a5a2..92d9145 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -132,6 +132,12 @@ class Commands(pyrpkg.Commands):
-         else:
-             self._target = '%s-candidate' % self.branch_merge
- 
-+    def load_container_build_target(self):
-+        if self.branch_merge == 'master':
-+            self._target = 'rawhide-%s-candidate' % self.ns
-+        else:
-+            super(Commands, self).load_container_build_target()
-+
-     def load_user(self):
-         """This sets the user attribute, based on the Fedora SSL cert."""
-         try:
--- 
-2.13.5
-

diff --git a/0002-Fix-container-build-target.patch b/0002-Fix-container-build-target.patch
deleted file mode 100644
index b630f46..0000000
--- a/0002-Fix-container-build-target.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6cfbc82c3b44e39ec81bd019cb3b6fa452630028 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Wed, 13 Sep 2017 09:06:49 +0200
-Subject: [PATCH 2/2] Fix container build target
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The value needs to be assigned to correct attribute, really...
-
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
----
- fedpkg/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index 92d9145..420eebe 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -134,7 +134,7 @@ class Commands(pyrpkg.Commands):
- 
-     def load_container_build_target(self):
-         if self.branch_merge == 'master':
--            self._target = 'rawhide-%s-candidate' % self.ns
-+            self._container_build_target = 'rawhide-%s-candidate' % self.ns
-         else:
-             super(Commands, self).load_container_build_target()
- 
--- 
-2.13.5
-

diff --git a/fedpkg.spec b/fedpkg.spec
index 25016a4..d1332ea 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -7,49 +7,49 @@
 %endif
 
 Name:           fedpkg
-Version:        1.29
-Release:        5%{?dist}
+Version:        1.30
+Release:        1%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            https://pagure.io/fedpkg
 Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
-Patch0:         0001-Get-correct-build-target-for-rawhide-containers.patch
-Patch1:         0002-Fix-container-build-target.patch
 
 BuildArch:      noarch
 
 BuildRequires:  pkgconfig
 BuildRequires:  python2-devel
-%if 0%{?rhel} && 0%{?rhel} < 7
-BuildRequires:  python-setuptools
-%else
-BuildRequires:  python2-setuptools
-%endif
 # We br these things for man page generation due to imports
-BuildRequires:  pyrpkg >= 1.50
-BuildRequires:  fedora-cert
+BuildRequires:  pyrpkg >= 1.51
 BuildRequires:  bash-completion
 # This until fedora-cert gets fixed
 BuildRequires:  python2-fedora
 # For testing
 BuildRequires:  git
 BuildRequires:  python2-mock
+
+%if 0%{?rhel}
+BuildRequires:  python-unittest2
+%else
+BuildRequires:  python2-unittest2
+%endif
+
 %if 0%{?rhel} && 0%{?rhel} < 7
 BuildRequires:  python-nose
+BuildRequires:  python-setuptools
 %else
 BuildRequires:  python2-nose
+BuildRequires:  python2-setuptools
 %endif
 
+Requires:       bash-completion
 Requires:       bodhi-client
-Requires:       fedora-cert
 Requires:       fedora-packager
 Requires:       koji
-Requires:       pyrpkg >= 1.50
-Requires:       python2-fedora
-Requires:       python2-pycurl
 Requires:       redhat-rpm-config
+Requires:       pyrpkg >= 1.51
+Requires:       python2-fedora
 Requires:       python2-openidc-client
 
 
@@ -66,8 +66,6 @@ Provides the fedpkg command for working with dist-git
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -93,24 +91,43 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
-%doc COPYING README CHANGELOG.rst
+%doc README CHANGELOG.rst
+%license COPYING
 %config(noreplace) %{_sysconfdir}/rpkg/fedpkg.conf
 %(dirname %{compdir})
 %{_bindir}/%{name}
 %{_mandir}/*/*
 # For noarch packages: sitelib
-%{python_sitelib}/*
+%{python_sitelib}/%{name}
+%{python_sitelib}/%{name}-%{version}-py*.egg-info
 # zsh completion
 %{_datadir}/zsh/site-functions/_%{name}
 
 %files  stage
-%defattr(-,root,root,-)
 %{_bindir}/%{name}-stage
 %config(noreplace) %{_sysconfdir}/rpkg/fedpkg-stage.conf
 
 
 %changelog
+* Fri Oct 20 2017 Chenxiong Qi <cqi@redhat.com> - 1.30-1
+- Tests for update command (cqi)
+- Add support for module commands (mprahl)
+- Clean rest cert related code (cqi)
+- Remove fedora cert (cqi)
+- Override build URL for Koji (cqi)
+- changing anongiturl to use src.fp.o instead of pkgs.fp.o. - #119 (tflink)
+- Add tests (cqi)
+- Enable lookaside_namespaced - #130 (cqi)
+- Detect dist tag correctly for RHEL and CentOS - #141 (cqi)
+- Remove deprecated call to platform.dist (cqi)
+- Do not prompt hint for SSL cert if fail to log into Koji (cqi)
+- Add more container-build options to bash completion (cqi)
+- Remove osbs from bash completion - #138 (cqi)
+- Install executables via entry_points - #134 (cqi)
+- Fix container build target (lsedlar)
+- Get correct build target for rawhide containers (lsedlar)
+- Update error message to reflect deprecation of --dist option (pgier)
+
 * Fri Sep 15 2017 Lubomír Sedlář <lsedlar@redhat.com> - 1.29-5
 - Use correct build target for containers