diff --git a/.gitignore b/.gitignore index e69de29..a05a327 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,12 @@ +/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 +/dbus-python-1.2.8.tar.gz +/dbus-python-1.2.8.tar.gz.asc +/dbus-python-1.2.16.tar.gz +/dbus-python-1.2.16.tar.gz.asc diff --git a/0001-Move-python-modules-to-architecture-specific-directo.patch b/0001-Move-python-modules-to-architecture-specific-directo.patch new file mode 100644 index 0000000..a9fded0 --- /dev/null +++ b/0001-Move-python-modules-to-architecture-specific-directo.patch @@ -0,0 +1,52 @@ +From 380ae714f641a73a30f86ae8f5a2e05ac063b37f Mon Sep 17 00:00:00 2001 +From: leigh123linux +Date: Tue, 23 Feb 2016 07:32:08 +0000 +Subject: [PATCH] Move python modules to architecture-specific directory + +This is because dbus-python gets dragged in as a dependency of other +things people want to be multilib-compatible. As is the Python +modules conflict. +--- + Makefile.am | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index fd480d4..0859994 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -155,7 +155,8 @@ test_dbus_py_test_la_SOURCES = \ + + # === dbus package === + +-nobase_python_PYTHON = \ ++dbuspydir = $(pyexecdir) ++nobase_dbuspy_DATA = \ + dbus/bus.py \ + dbus/connection.py \ + dbus/_compat.py \ +@@ -175,12 +176,12 @@ nobase_python_PYTHON = \ + dbus/types.py + + if !HAVE_PYTHON_3 +-nobase_python_PYTHON += \ ++nobase_dbuspy_DATA += \ + dbus/gobject_service.py \ + $(NULL) + endif + +-check_py_sources = $(nobase_python_PYTHON) ++check_py_sources = $(nobase_dbuspy_DATA) + include $(top_srcdir)/tools/check-coding-style.mk + + # === Devel stuff === +@@ -416,7 +417,7 @@ uninstall-local: uninstall-local-sphinx + if ENABLE_DOCUMENTATION + all: doc/_build/.stamp + +-doc/_build/.stamp: $(nobase_python_PYTHON) \ ++doc/_build/.stamp: $(nobase_dbuspy_DATA) \ + _dbus_bindings.la \ + _dbus_glib_bindings.la \ + $(sphinx_sources) \ +-- +2.17.0 diff --git a/dbus-python.spec b/dbus-python.spec new file mode 100644 index 0000000..c65cbf0 --- /dev/null +++ b/dbus-python.spec @@ -0,0 +1,321 @@ +Summary: D-Bus Python Bindings +Name: dbus-python +Version: 1.2.16 +Release: 3%{?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 + +# borrow centos7 patch to use sitearch properly +Patch0: 0001-Move-python-modules-to-architecture-specific-directo.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1788491 +Patch1: python39.patch + +BuildRequires: dbus-devel +BuildRequires: glib2-devel +# for %%check +BuildRequires: dbus-x11 +BuildRequires: python%{python3_pkgversion}-gobject +# autoreconf and friends +BuildRequires: autoconf-archive automake libtool + +%global _description\ +D-Bus python bindings for use with python programs. + +%description %_description + +%package -n python%{python3_pkgversion}-dbus +Summary: D-Bus bindings for python3 +%{?python_provide:%python_provide python%{python3_pkgversion}-dbus} +BuildRequires: python%{python3_pkgversion}-devel +# for py3_build +BuildRequires: python3dist(setuptools) + +%description -n python%{python3_pkgversion}-dbus +%{summary}. + +%package devel +Summary: Libraries and headers for dbus-python + +%description devel +Headers and static libraries for hooking up custom mainloops to the dbus python +bindings. + +%prep +%autosetup -p1 + +# For new arches (aarch64/ppc64le), and patch0 +autoreconf -vif + +%build +%set_build_flags +%py3_build +%configure PYTHON="%{__python3}" +%make_build + +%install +%py3_install +%make_install + +# unpackaged files +rm -fv $RPM_BUILD_ROOT%{python3_sitearch}/*.la +rm -rfv $RPM_BUILD_ROOT%{_datadir}/doc/dbus-python/ + +%check +make check -k || (cat test-suite.log && false) + +%files -n python%{python3_pkgversion}-dbus +%doc NEWS +%license COPYING +%{python3_sitearch}/*.so +%{python3_sitearch}/dbus/ +%{python3_sitearch}/dbus_python*egg-info + +%files devel +%doc README ChangeLog doc/API_CHANGES.txt doc/tutorial.txt +%{_includedir}/dbus-1.0/dbus/dbus-python.h +%{_libdir}/pkgconfig/dbus-python.pc + +%changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.2.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 23 2020 Miro Hrončok - 1.2.16-2 +- Rebuilt for Python 3.9 + +* Tue Feb 11 2020 Leigh Scott - 1.2.16-1 +- Update to 1.2.16 (#1788491) + +* Tue Jan 28 2020 Fedora Release Engineering - 1.2.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jan 16 2020 Miro Hrončok - 1.2.8-9 +- Subpackage python2-dbus has been removed + See https://fedoraproject.org/wiki/Changes/RetirePython2 + +* Thu Oct 03 2019 Miro Hrončok - 1.2.8-8 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Thu Aug 15 2019 Miro Hrončok - 1.2.8-7 +- Rebuilt for Python 3.8 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.2.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Feb 11 2019 Neal Gompa - 1.2.8-5 +- Run setuptools build to generate pythonXdist() metadata (#1663693) + +* Thu Jan 31 2019 Fedora Release Engineering - 1.2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat Jun 16 2018 Miro Hrončok - 1.2.8-2 +- Rebuilt for Python 3.7 + +* Wed May 23 2018 Miro Hrončok - 1.2.8-1 +- Update to 1.2.8 (#1539950) (#1578726) +- Cat the logs if tests failed + +* Wed Feb 07 2018 Fedora Release Engineering - 1.2.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 03 2018 Iryna Shcherbina - 1.2.4-12 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Nov 08 2017 Igor Gnatenko - 1.2.4-11 +- Cleanups in packaging + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.2.4-10 +- Also add Provides for the old name without %%_isa +- Use %%python_provide for the python3 subpackage and drop manual Provide which + conflicts with %%python_provide in the python2 subpackage. + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.2.4-9 +- Python 2 binary package renamed to python2-dbus + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Wed Aug 02 2017 Fedora Release Engineering - 1.2.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.2.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.2.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Dec 21 2016 Kevin Fenzi - 1.2.4-5 +- Rebuild again for Python 3.6 + +* Sun Dec 11 2016 leigh scott - 1.2.4-4 +- Add missing build requires needed for check + +* Fri Dec 09 2016 Charalampos Stratakis - 1.2.4-3 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 1.2.4-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon Mar 07 2016 Leigh Scott - 1.2.4-1 +- Update to 1.2.4 (#1310915) + +* Tue Feb 23 2016 Leigh Scott - 1.2.2-1 +- Update to 1.2.2 (#1310915) +- add build requires autoconf-archive + +* Wed Feb 03 2016 Fedora Release Engineering - 1.2.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Nov 16 2015 Leigh Scott - 1.2.0-12 +- Drop object manager patch + +* Tue Oct 13 2015 Robert Kuska - 1.2.0-11 +- Rebuilt for Python3.5 rebuild + +* Wed Aug 19 2015 Leigh Scott - 1.2.0-10 +- rebuilt + +* Wed Aug 19 2015 Leigh Scott - 1.2.0-9 +- rebuilt + +* Wed Jun 17 2015 Fedora Release Engineering - 1.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Nov 06 2014 Rex Dieter 1.2.0-7 +- python2_sitelib should be python2_sitearch (#1161121) +- update URL, s/python/python2/ a bit + +* Sat Aug 16 2014 Fedora Release Engineering - 1.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jun 20 2014 Dan Mashal - 1.2.0-5 +- Add patch needed that adds Object Manager functionality for Fedora server dbus api. + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Peter Robinson 1.2.0-3 +- Drop old python3 conditionals, SPEC cleanups + +* Mon May 12 2014 Rex Dieter 1.2.0-2 +- rebuild (f21-python) + +* Mon Oct 28 2013 Rex Dieter 1.2.0-1 +- dbus-python-1.2.0 is available (#1021817) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Apr 25 2013 Peter Robinson 1.1.1-5 +- Add upstream patch to fix pygobject 3.8 + +* Fri Mar 29 2013 Dan Mashal - 1.1.1-4 +- Apply patch to support aarch64 (#925236) +- Fix URL + +* Mon Feb 25 2013 Rex Dieter - 1.1.1-3 +- python3-dbus subpkg (#892474) +- (main) Provides: python-dbus +- BR: python-docutils +- .spec cosmetics +- skip failed tests on rawhide (#913936) + +* Wed Feb 13 2013 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Aug 07 2012 Rex Dieter 1.1.1-1 +- dbus-python-1.1.1 (#800487) + +* Wed Jul 18 2012 Fedora Release Engineering - 0.83.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.83.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 0.83.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jul 21 2010 David Malcolm - 0.83.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Fri Jul 24 2009 Fedora Release Engineering - 0.83.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 0.83.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.83.0-4 +- Rebuild for Python 2.6 + +* Tue Sep 16 2008 Marco Pesenti Gritti - 0.83.0-3 +- Add patch for https://bugs.freedesktop.org/show_bug.cgi?id=17551 + +* Tue Aug 05 2008 Huang Peng - 0.83.0-2 +- Update to 0.83.0. + +* Wed Jul 16 2008 Tom "spot" Callaway - 0.82.4-3 +- fix license tag + +* Mon Feb 18 2008 Fedora Release Engineering - 0.82.4-2 +- Autorebuild for GCC 4.3 + +* Sun Jan 20 2008 Matthias Clasen - 0.82.4-1 +- Update to 0.82.4 + +* Mon Oct 22 2007 Matthias Clasen - 0.82.0-3 +- Rebuild against new dbus-glib + +* Tue Aug 28 2007 Fedora Release Engineering - 0.82.0-2 +- Rebuild for selinux ppc32 issue. + +* Fri Jun 22 2007 Matthias Clasen - 0.82.0-1 +- Update to 0.82.0 +- Put all docs in the usual place + +* Tue Apr 03 2007 David Zeuthen - 0.80.2-3 +- Rebuild + +* Tue Apr 03 2007 David Zeuthen - 0.80.2-2 +- Don't examine args for functions declared METH_NOARGS (#235017) + +* Tue Feb 13 2007 John (J5) Palmieri - 0.80.2-1 +- upgrade to 0.80.2 which fixes some memleaks + +* Wed Jan 24 2007 John (J5) Palmieri - 0.80.1-1 +- upgrade to 0.80.1 +- remove dependency on Pyrex and libxml2 +- some API breakage, + please see http://dbus.freedesktop.org/doc/dbus-python/NEWS.html + for notes on changes + +* Wed Jan 3 2007 David Zeuthen - 0.70-9%{?dist} +- rebuild against new Pyrex + +* Wed Dec 6 2006 Jeremy Katz - 0.70-8 +- rebuild against python 2.5 + +* Tue Nov 7 2006 Matthias Clasen - 0.70-7 +- Fix a typo in the spec file + +* Fri Aug 18 2006 Karsten Hopp - 0.70-6 +- require libxml2-python for site-packages/dbus/introspect_parser.py + +* Thu Jul 20 2006 Jesse Keating - 0.70-5 +- Remove unnecessary obsoletes + +* Tue Jul 18 2006 John (J5) Palmieri - 0.70-4 +- Try python_sitearch this time + +* Tue Jul 18 2006 John (J5) Palmieri - 0.70-3 +- Add a BR on dbus-devel + +* Tue Jul 18 2006 John (J5) Palmieri - 0.70-2 +- Spec file cleanups +- Add PKG_CONFIG_PATH + +* Mon Jul 17 2006 John (J5) Palmieri - 0.70-1 +- Initial package import diff --git a/python39.patch b/python39.patch new file mode 100644 index 0000000..e7bd1b5 --- /dev/null +++ b/python39.patch @@ -0,0 +1,12 @@ +--- a/dbus/service.py ++++ b/dbus/service.py +@@ -32,7 +32,7 @@ + import logging + import threading + import traceback +-from collections import Sequence ++from collections.abc import Sequence + + import _dbus_bindings + from dbus import ( + diff --git a/sources b/sources new file mode 100644 index 0000000..cdb6265 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (dbus-python-1.2.16.tar.gz) = e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c +SHA512 (dbus-python-1.2.16.tar.gz.asc) = 1a8355303f86cba326e5380e9a3af38fca10d389b45d30c3a22d66de6ebb3afb5517c58fd00645f40a1c980739bb6cf8cc0e06b06a4e2e8c5e9eea66a71ff590 diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..f5fe277 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,15 @@ +--- +# 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 diff --git a/tests/upstream-testset/runtest.sh b/tests/upstream-testset/runtest.sh new file mode 100755 index 0000000..4816404 --- /dev/null +++ b/tests/upstream-testset/runtest.sh @@ -0,0 +1,55 @@ +#!/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 + +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