From 938ba6018311710736462bc707b7a95a0c728da0 Mon Sep 17 00:00:00 2001 From: panxiaohe Date: Thu, 29 Oct 2020 15:50:58 +0800 Subject: [PATCH] remove subpackage python2-dbus --- dbus-python.spec | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/dbus-python.spec b/dbus-python.spec index 93db844..23dff8e 100644 --- a/dbus-python.spec +++ b/dbus-python.spec @@ -2,7 +2,7 @@ Name: dbus-python Version: 1.2.16 -Release: 1 +Release: 2 Summary: original Python binding for dbus License: MIT URL: http://www.freedesktop.org/wiki/Software/DBusBindings/ @@ -10,28 +10,20 @@ Source0: http://dbus.freedesktop.org/releases/dbus-python/%{name}-%{version}.tar Source1: http://dbus.freedesktop.org/releases/dbus-python/%{name}-%{version}.tar.gz.asc Patch0: 0001-Move-python-modules-to-architecture-specific-directo.patch -BuildRequires: dbus-devel dbus-glib-devel python2-docutils glib2-devel -BuildRequires: dbus-x11 python2-gobject python3-gobject +BuildRequires: dbus-devel dbus-glib-devel glib2-devel +BuildRequires: dbus-x11 python3-gobject BuildRequires: autoconf-archive automake libtool gdb %description Dbus-python is the original Python binding for dbus, the reference implementation of the D-Bus protocol. -%package -n python2-dbus -Summary: Python2 bindings for dbus -BuildRequires: python2-devel -Provides: %{name} = %{version}-%{release} -Provides: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < %{version}-%{release} -%{?python_provide:%python_provide python2-dbus} - -%description -n python2-dbus -Python2 bindings for dbus. - %package -n python3-dbus Summary: Python3 bindings for dbus BuildRequires: python3-devel +Provides: dbus-python = %{version}-%{release} +Obsoletes: dbus-python < %{version}-%{release} + %{?python_provide:%python_provide python3-dbus} %description -n python3-dbus @@ -53,20 +45,15 @@ developing applications that use %{name}. %build autoreconf -vif -mkdir -p python2-build python3-build -pushd python2-build; %configure PYTHON="%{__python2}" -%make_build; popd - +mkdir -p python3-build pushd python3-build; %configure PYTHON="%{__python3}" %make_build; popd %install -%make_install -C python2-build %make_install -C python3-build find %{buildroot} -name '*.la' -delete %check -make check -k -C python2-build make check -k -C python3-build %pre @@ -77,12 +64,6 @@ make check -k -C python3-build %postun -p /sbin/ldconfig -%files -n python2-dbus -%license COPYING -%{python2_sitearch}/_dbus_bindings.so -%{python2_sitearch}/_dbus_glib_bindings.so -%{python2_sitearch}/dbus/ - %files -n python3-dbus %license COPYING %{python3_sitearch}/_dbus_bindings.so @@ -97,6 +78,12 @@ make check -k -C python3-build %doc NEWS ChangeLog README doc/API_CHANGES.txt doc/tutorial.txt %changelog +* Thu Oct 29 2020 panxiaohe - 1.2.16-2 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:remove subpackage python2-dbus + * Fri Jul 31 2020 Liquor - 1.2.16-1 - Type:update - ID:NA -- Gitee