.dbus-python.metadata

@@ -0,0 +1,2 @@
+ab94729c940f0d95dde2503a96e5c3e2f4644b76 SOURCES/dbus-python-1.2.18.tar.gz
+508f737c63c229d468bf886a9f2767872d73670d SOURCES/gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg

.gitignore

@@ -1,8 +1,2 @@
-/dbus-python-0.83.0.tar.gz
-/dbus-python-1.1.1.tar.gz
-/dbus-python-1.2.0.tar.gz
-/dbus-python-1.2.0.tar.gz.asc
-/dbus-python-1.2.2.tar.gz
-/dbus-python-1.2.2.tar.gz.asc
-/dbus-python-1.2.4.tar.gz
-/dbus-python-1.2.4.tar.gz.asc
+SOURCES/dbus-python-1.2.18.tar.gz
+SOURCES/gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg

SOURCES/0001-Move-python-modules-to-architecture-specific-directo.patch

@@ -11,10 +11,10 @@ modules conflict.
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 3a821fa..dcf4320 100644
+index fd480d4..0859994 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -146,7 +146,8 @@ dbus_py_test_la_SOURCES = \
+@@ -155,7 +155,8 @@ test_dbus_py_test_la_SOURCES = \
  
  # === dbus package ===
  
@@ -24,7 +24,7 @@ index 3a821fa..dcf4320 100644
      dbus/bus.py \
      dbus/connection.py \
      dbus/_compat.py \
-@@ -167,12 +168,12 @@ nobase_python_PYTHON = \
+@@ -175,12 +176,12 @@ nobase_python_PYTHON = \
      dbus/types.py
  
  if !HAVE_PYTHON_3
@@ -39,15 +39,14 @@ index 3a821fa..dcf4320 100644
  include $(top_srcdir)/tools/check-coding-style.mk
  
  # === Devel stuff ===
-@@ -415,7 +416,7 @@ clean-local:
+@@ -416,7 +417,7 @@ uninstall-local: uninstall-local-sphinx
+ if ENABLE_DOCUMENTATION
+ all: doc/_build/.stamp
  
- APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/.libs
- 
--api api/index.html: $(nobase_python_PYTHON) \
-+api api/index.html: $(nobase_dbuspy_DATA) \
- 		    _dbus_bindings.la \
- 		    _dbus_glib_bindings.la
- 	rm -rf api
+-doc/_build/.stamp: $(nobase_python_PYTHON) \
++doc/_build/.stamp: $(nobase_dbuspy_DATA) \
+ 			_dbus_bindings.la \
+ 			_dbus_glib_bindings.la \
+ 			$(sphinx_sources) \
 -- 
-2.5.0
-
+2.17.0

SOURCES/dbus-python-1.2.18.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAmD2m9QACgkQ4FrhR4+B
+TE+OYg/+KbSBEGZtRgcMAsU2SOn88m1Uf3aXm41s7Vg8gMOd3zwQ8emVQP7EbcVu
+6l+RddGVEWltucdoPsppzTnaNgcWDt9+0KNLzBiqROGJwi6BLKl+ZsDaQGq0DPT2
+pV1lBXg0bnivak5CHOCkmKcK1dUr3A9RBDR7YCMN/Uv2jCv7Ci7ZE//NMlB0Teax
+Pv9j45KHKZ/LNJLBuZ0AE2JL4LbSrvsZfDacXcRdWzqtZTchCzQ5tccQzgRtBgSC
+NQnBOtew4eVclD7DQ6zPOMElaK81JgtVDcg3tm/KEser1BrHQNi45gmWhfkiHgQN
+6gDEnkWFTx+fo7GNU2/XpG1CQ/MgwAr9Led9tdJl01mw730Did4Y2TB2/4ZXQsSz
+UAvcqxJORU/oafGZtVI5nC1n30Q5M53fr2zGV9Pf0/9pfy8gH0Dm76tE9yjim3FJ
+iMXGV31eQWnnRqvlVD8U6CStVnmz8ZuPADSon65HTZYlplK7oZp8oYZG8R2nEIED
+yvbFqWhSJAqdKz2xpQ6OMzs5OlQe2UTj0XKfZlqKe8DFot2d1oJjMp1cg6rvKqg4
+ZjswqyzKTHLRs7fO/0kB9DgzMIs1KujurI1lzJwPoODefh/mybnU+FBlr6OrSHvS
+/TQ+OdU0PZDsxJCH5+ezh3HW8yuY08Nc08dHkyjh8ENx7MiRhlw=
+=JTFX
+-----END PGP SIGNATURE-----

SPECS/dbus-python.spec

@@ -1,37 +1,25 @@
-%if 0%{?rhel} > 7
-# Disable python2 build by default
-%bcond_with python2
-%else
-%bcond_without python2
-%endif
-
-%global python2dir %{_builddir}/python2-%{name}-%{version}-%{release}
-%global python3dir %{_builddir}/python3-%{name}-%{version}-%{release}
-
 Summary: D-Bus Python Bindings
 Name:    dbus-python
-Version: 1.2.4
-Release: 15%{?dist}
+Version: 1.2.18
+Release: 2%{?dist}
 
 License: MIT
 URL:     http://www.freedesktop.org/wiki/Software/DBusBindings/
 Source0: http://dbus.freedesktop.org/releases/dbus-python/%{name}-%{version}.tar.gz
 Source1: http://dbus.freedesktop.org/releases/dbus-python/%{name}-%{version}.tar.gz.asc
+# gpg --keyserver keyring.debian.org --recv-keys 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F
+# gpg --export --export-options export-minimal > gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg
+Source2: gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg
 
 # borrow centos7 patch to use sitearch properly
 Patch0: 0001-Move-python-modules-to-architecture-specific-directo.patch
 
-BuildRequires: dbus-devel
-BuildRequires: dbus-glib-devel
-%if %{with python2}
-BuildRequires: python2-docutils
-%endif # with python2
+BuildRequires: gnupg2
+BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(glib-2.0)
 # for %%check
 BuildRequires: dbus-x11
-%if %{with python2}
-BuildRequires: python2-gobject
-%endif # with python2
-BuildRequires: python3-gobject
+BuildRequires: python%{python3_pkgversion}-gobject
 # autoreconf and friends
 BuildRequires: autoconf-archive automake libtool
 
@@ -40,27 +28,15 @@ D-Bus python bindings for use with python programs.
 
 %description %_description
 
-%if %{with python2}
-%package -n python2-dbus
-Summary: %summary
-%{?python_provide:%python_provide python2-dbus}
-BuildRequires: python2-devel
-BuildRequires: python2dist(setuptools)
-# Remove before F30
-Provides: dbus-python = %{version}-%{release}
-Provides: dbus-python%{?_isa} = %{version}-%{release}
-Obsoletes: dbus-python < %{version}-%{release}
-
-%description -n python2-dbus %_description
-%endif # with python2
-
-%package -n python3-dbus
+%package -n python%{python3_pkgversion}-dbus
 Summary: D-Bus bindings for python3
-%{?python_provide:%python_provide python3-dbus}
-BuildRequires: python3-devel
+%{?python_provide:%python_provide python%{python3_pkgversion}-dbus}
+BuildRequires: python%{python3_pkgversion}-devel
+# for py3_build
 BuildRequires: python3dist(setuptools)
+BuildRequires: make
 
-%description -n python3-dbus
+%description -n python%{python3_pkgversion}-dbus
 %{summary}.
 
 %package devel
@@ -71,72 +47,30 @@ Headers and static libraries for hooking up custom mainloops to the dbus python
 bindings.
 
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1
 
 # For new arches (aarch64/ppc64le), and patch0
 autoreconf -vif
 
-%if %{with python2}
-mkdir -p %{python2dir}
-cp -a . %{python2dir}
-mv %{python2dir} python2-build
-%endif
-mkdir -p %{python3dir}
-cp -a . %{python3dir}
-mv %{python3dir} python3-build
-
 %build
-%global _configure ../configure
-
-%if %{with python2}
-pushd python2-build
-%py2_build
-%configure PYTHON="%{__python2}"
-%make_build
-popd
-%endif # with python2
-
-pushd python3-build
+%set_build_flags
 %py3_build
 %configure PYTHON="%{__python3}"
 %make_build
-popd
 
 %install
-%if %{with python2}
-pushd python2-build
-%py2_install
-%make_install
-popd
-%endif # with python2
-pushd python3-build
 %py3_install
 %make_install
-popd
 
 # unpackaged files
-%if %{with python2}
-rm -fv  $RPM_BUILD_ROOT%{python2_sitearch}/*.la
-%endif # with python2
 rm -fv  $RPM_BUILD_ROOT%{python3_sitearch}/*.la
 rm -rfv $RPM_BUILD_ROOT%{_datadir}/doc/dbus-python/
 
 %check
-%if %{with python2}
-make check -k -C python2-build
-%endif # with python2
-make check -k -C python3-build
+make check -k || (cat test-suite.log && false)
 
-%if %{with python2}
-%files -n python2-dbus
-%doc NEWS
-%license COPYING
-%{python2_sitearch}/*.so
-%{python2_sitearch}/dbus/
-%{python2_sitearch}/dbus_python*egg-info
-%endif # with python2
-
-%files -n python3-dbus
+%files -n python%{python3_pkgversion}-dbus
 %doc NEWS
 %license COPYING
 %{python3_sitearch}/*.so
@@ -144,17 +78,65 @@ make check -k -C python3-build
 %{python3_sitearch}/dbus_python*egg-info
 
 %files devel
-%doc README ChangeLog doc/API_CHANGES.txt doc/HACKING.txt doc/tutorial.txt
+%doc README ChangeLog doc/API_CHANGES.txt doc/tutorial.txt
 %{_includedir}/dbus-1.0/dbus/dbus-python.h
 %{_libdir}/pkgconfig/dbus-python.pc
 
 %changelog
-* Thu Jun 06 2019 Josh Boyer <jwboyer@redhat.com> - 1.2.4-15
-- Backport patch from Neal Gompa <ngompa13@gmail.com> to generate pythonXdist
-  metadata
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.18-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Sun Jul 22 2018 Charalampos Stratakis <cstratak@redhat.com> - 1.2.4-14
-- Conditionalize the python2 subpackage
+* Mon Jul 26 2021 David King <amigadave@amigadave.com> - 1.2.18-1
+- Update to 1.2.18 (#1985856)
+- Verify GPG signature of sources
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.16-5
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.16-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.2.16-2
+- Rebuilt for Python 3.9
+
+* Tue Feb 11 2020 Leigh Scott <leigh123linux@gmail.com> - 1.2.16-1
+- Update to 1.2.16 (#1788491)
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jan 16 2020 Miro Hrončok <mhroncok@redhat.com> - 1.2.8-9
+- Subpackage python2-dbus has been removed
+  See https://fedoraproject.org/wiki/Changes/RetirePython2
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.2.8-8
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.2.8-7
+- Rebuilt for Python 3.8
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Feb 11 2019 Neal Gompa <ngompa13@gmail.com> - 1.2.8-5
+- Run setuptools build to generate pythonXdist() metadata (#1663693)
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 1.2.8-2
+- Rebuilt for Python 3.7
+
+* Wed May 23 2018 Miro Hrončok <mhroncok@redhat.com> - 1.2.8-1
+- Update to 1.2.8 (#1539950) (#1578726)
+- Cat the logs if tests failed
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sources

@@ -1,2 +0,0 @@
-SHA512 (dbus-python-1.2.4.tar.gz) = efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
-SHA512 (dbus-python-1.2.4.tar.gz.asc) = 9eed51488cfbc1e7b8622647c1a4a0da2e4dd4459cd75d00e9b912aa6bd6cbc64e1d188df0b2c54c8c80ace5c5560d0e9368719ef40d43344d6a00cb7a92b95d

tests/tests.yml

@@ -1,15 +0,0 @@
----
-# This first play always runs on the local staging system
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    tests:
-    - upstream-testset
-    required_packages:
-    - python3-dbus
-    - rpm-build    
-    - gcc 
-    - wget
-    - make

tests/upstream-testset/runtest.sh

@@ -1,55 +0,0 @@
-#!/bin/bash -x
-
-# Copyright (c) 2015 Red Hat, Inc. All rights reserved. This copyrighted material
-# is made available to anyone wishing to use, modify, copy, or
-# redistribute it subject to the terms and conditions of the GNU General
-# Public License v.2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Author: Vladimir Benes <vbenes@redhat.com>
-
-PKG=dbus-python
-PKG_DIR=$2
-if [ -z "$PKG_DIR" ]; then
-  PKG_DIR=$1
-fi
-
-RPMBUILD=$(rpm --eval '%{_topdir}')
-LOG="/tmp/$TEST.log"
-PKG_SRPM=$(rpm -q --qf '%{SOURCERPM}\n' python3-dbus | head -n1)
-PKG_PATH=$(rpm -q --qf '%{VERSION}/%{RELEASE}\n' python3-dbus | head -n1)
-PKG_BUILD_PATH=$(rpm -q --qf "$PKG_DIR-%{VERSION}\n" $PKG | head -n1)
-
-echo "Downloading SRPM"
-wget https://kojipkgs.fedoraproject.org/packages/$PKG/$PKG_PATH/src/$PKG_SRPM
-rm -rf $RPMBUILD
-rpm -ivf $PKG_SRPM
-echo "Building dependencies"
-dnf builddep -y $PKG_SRPM
-echo "Rebuilding the package"
-rpmbuild -bc $RPMBUILD/SPECS/$PKG.spec
-echo "Running make check"
-cd $RPMBUILD/BUILD/$PKG*
-./configure
-make check | tee -a $LOG
-rc=$?
-RESULT=FAIL
-
-if [ $rc -eq 0 ]; then
-  RESULT="PASS"
-fi
-
-if which rhts-report-result &> /dev/null; then
-   rhts-report-result $TEST $RESULT $LOG
-fi
-
-exit $rc
-echo "Result is: $RESULT"
-rm $LOG