From: xuhy Date: Wed, 24 Apr 2024 08:59:46 +0000 (+0800) Subject: Fix a build error on opensuse15.5. X-Git-Tag: accepted/tools/devbase/tools/20250527.103808~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ac7b84528014cede1f0802d3c49c3a591cb0530;p=services%2Fobs-service-git-buildpackage.git Fix a build error on opensuse15.5. unresolvable issue: nothing provides python-setuptools Change-Id: Ia12200934877ec2b1ec798672954491dccc2774a Signed-off-by: xuhy --- diff --git a/packaging/obs-service-git-buildpackage.spec b/packaging/obs-service-git-buildpackage.spec index 41a7994..fce4658 100644 --- a/packaging/obs-service-git-buildpackage.spec +++ b/packaging/obs-service-git-buildpackage.spec @@ -17,11 +17,11 @@ Requires: git-buildpackage Requires: git-buildpackage-rpm >= 0.6.15 Requires: gbp-repocache = %{version}-%{release} Requires: %{name}-utils = %{version}-%{release} -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: python3 +BuildRequires: python3-setuptools %if 0%{?do_unittests} -BuildRequires: python-coverage -BuildRequires: python-nose +BuildRequires: python3-coverage +BuildRequires: python3-nose BuildRequires: git-buildpackage-rpm %endif BuildArch: noarch @@ -36,7 +36,7 @@ files that are managed with git-buildpackage tools. %package utils Summary: Utility fuctions for the GBP OBS source service Group: Development/Tools/Building -Requires: python >= 2.6 +Requires: python >= 3.0 Requires: gbp-repocache = %{version} %description utils @@ -59,7 +59,7 @@ cache. %build -%{__python} setup.py build +%{__python3} setup.py build cp config/git-buildpackage config/obs-service-git-buildpackage.example.config @@ -67,13 +67,13 @@ cp config/git-buildpackage config/obs-service-git-buildpackage.example.config %check GIT_AUTHOR_EMAIL=rpmbuild@example.com GIT_AUTHOR_NAME=rpmbuild \ GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL \ - %{__python} setup.py nosetests + %{__python3} setup.py nosetests %endif %install -%{__python} setup.py install --skip-build --root=%{buildroot} --prefix=%{_prefix} -rm -rf %{buildroot}%{python_sitelib}/*info +%{__python3} setup.py install --skip-build --root=%{buildroot} --prefix=%{_prefix} +rm -rf %{buildroot}%{python3_sitelib}/*info %files @@ -83,7 +83,7 @@ rm -rf %{buildroot}%{python_sitelib}/*info %dir /usr/lib/obs %dir /usr/lib/obs/service /usr/lib/obs/service/* -%{python_sitelib}/obs_service_gbp +%{python3_sitelib}/obs_service_gbp %dir %{_sysconfdir}/obs %dir %{_sysconfdir}/obs/services %config %{_sysconfdir}/obs/services/* @@ -91,11 +91,11 @@ rm -rf %{buildroot}%{python_sitelib}/*info %files utils %defattr(-,root,root,-) %doc COPYING -%{python_sitelib}/obs_service_gbp_utils +%{python3_sitelib}/obs_service_gbp_utils %files -n gbp-repocache %defattr(-,root,root,-) %doc COPYING %{_bindir}/repocache-adm -%{python_sitelib}/gbp_repocache -%{python_sitelib}/repocache_adm +%{python3_sitelib}/gbp_repocache +%{python3_sitelib}/repocache_adm