Compare commits
No commits in common. "c8s" and "c10s" have entirely different histories.
8
.gitignore
vendored
8
.gitignore
vendored
@ -6,3 +6,11 @@
|
||||
/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
|
||||
/dbus-python-1.2.18.tar.gz
|
||||
/dbus-python-1.2.18.tar.gz.asc
|
||||
/dbus-python-1.3.2.tar.gz
|
||||
/dbus-python-1.3.2.tar.gz.asc
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 380ae714f641a73a30f86ae8f5a2e05ac063b37f Mon Sep 17 00:00:00 2001
|
||||
From 86741aa93aaaf388899d1fa0c25d0d67729b7a5c Mon Sep 17 00:00:00 2001
|
||||
From: leigh123linux <leigh123linux@googlemail.com>
|
||||
Date: Tue, 23 Feb 2016 07:32:08 +0000
|
||||
Subject: [PATCH] Move python modules to architecture-specific directory
|
||||
@ -7,14 +7,14 @@ 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(-)
|
||||
Makefile.am | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 3a821fa..dcf4320 100644
|
||||
index 8738d57..b6d30c0 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -146,7 +146,8 @@ dbus_py_test_la_SOURCES = \
|
||||
@@ -176,7 +176,8 @@ test_dbus_py_test_la_SOURCES = \
|
||||
|
||||
# === dbus package ===
|
||||
|
||||
@ -24,30 +24,24 @@ index 3a821fa..dcf4320 100644
|
||||
dbus/bus.py \
|
||||
dbus/connection.py \
|
||||
dbus/_compat.py \
|
||||
@@ -167,12 +168,12 @@ nobase_python_PYTHON = \
|
||||
@@ -195,7 +196,7 @@ nobase_python_PYTHON = \
|
||||
dbus/service.py \
|
||||
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 ===
|
||||
@@ -415,7 +416,7 @@ clean-local:
|
||||
@@ -434,7 +435,7 @@ uninstall-local-pycache:
|
||||
if ENABLE_DOCUMENTATION
|
||||
all: doc/html/.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/html/.stamp: $(nobase_python_PYTHON) \
|
||||
+doc/html/.stamp: $(nobase_dbuspy_DATA) \
|
||||
_dbus_bindings.la \
|
||||
_dbus_glib_bindings.la \
|
||||
$(sphinx_sources) \
|
||||
--
|
||||
2.5.0
|
||||
2.37.3
|
||||
|
||||
|
||||
206
dbus-python.spec
206
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.3.2
|
||||
Release: 8%{?dist}
|
||||
Summary: D-Bus Python Bindings
|
||||
|
||||
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,17 @@ 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: python3dist(setuptools-scm)
|
||||
BuildRequires: python3dist(wheel)
|
||||
BuildRequires: make
|
||||
|
||||
%description -n python3-dbus
|
||||
%description -n python%{python3_pkgversion}-dbus
|
||||
%{summary}.
|
||||
|
||||
%package devel
|
||||
@ -71,72 +49,32 @@ 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
|
||||
export DBUS_PYTHON_USE_AUTOTOOLS=1
|
||||
%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
|
||||
export DBUS_PYTHON_USE_AUTOTOOLS=1
|
||||
%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 +82,101 @@ 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
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.3.2-8
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Sun Jul 22 2018 Charalampos Stratakis <cstratak@redhat.com> - 1.2.4-14
|
||||
- Conditionalize the python2 subpackage
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.3.2-7
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1.3.2-3
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Sep 29 2022 Vojtech Trefny <vtrefny@redhat.com> - 1.3.2-1
|
||||
- Update to 1.3.2 (#2124688)
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.18-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.2.18-4
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.18-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.18-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jul 20 2021 David King <amigadave@amigadave.com> - 1.2.18-1
|
||||
- Update to 1.2.18 (#1984073)
|
||||
|
||||
* Sun Jun 13 2021 David King <amigadave@amigadave.com> - 1.2.16-6
|
||||
- Verify GPG signature of sources
|
||||
- Use pkgconfig for BuildRequires
|
||||
|
||||
* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.2.16-5
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* 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
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
|
||||
BIN
gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg
Normal file
BIN
gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg
Normal file
Binary file not shown.
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (dbus-python-1.2.4.tar.gz) = efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
|
||||
SHA512 (dbus-python-1.2.4.tar.gz.asc) = 9eed51488cfbc1e7b8622647c1a4a0da2e4dd4459cd75d00e9b912aa6bd6cbc64e1d188df0b2c54c8c80ace5c5560d0e9368719ef40d43344d6a00cb7a92b95d
|
||||
SHA512 (dbus-python-1.3.2.tar.gz) = 9b2885c9c2914142c72487f766b1cdd28a255d9f5a87eaf8f4eb420c6e096a77f210ac5a4fac9843c6531974872880cc28b7e45940e198856e984dcc0715519a
|
||||
SHA512 (dbus-python-1.3.2.tar.gz.asc) = d8bdd6eefcd9aef029d6de5dd604f2ef8dc19bfc4a0504ad4fc33a9e8a4c3791f6ba24f3f65e2e2b5c3f1de96a5e61d500f946d7dc55771e4e85975bb94c7ce1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user