Attachment 879524 Details for Bug 1081572 – suggested patch

[patch] suggested patch

0003-Make-building-python3-components-optional.patch (text/plain), 6.01 KB, created by Matěj Cepl on 2014-03-27 15:18:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2014-03-27 15:18:16 UTC

Size: 6.01 KB

patch

obsolete

>From f1bfb2aced259ec8e7316cf40af4f1f092aa8d1e Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
>Date: Thu, 27 Mar 2014 16:10:20 +0100
>Subject: [PATCH 3/3] Make building python3 components optional.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Also, replace TABs with spaces.
>
>Signed-off-by: MatÄj Cepl <mcepl@redhat.com>
>---
> dnf.spec | 107 ++++++++++++++++++++++++++++++++++++++-------------------------
> 1 file changed, 65 insertions(+), 42 deletions(-)
>
>diff --git a/dnf.spec b/dnf.spec
>index 6cf0dd8..a9a3bf7 100644
>--- a/dnf.spec
>+++ b/dnf.spec
>@@ -1,3 +1,9 @@
>+%if 0%{?rhel} <= 7
>+%bcond_with python3
>+%else
>+%bcond_without python3
>+%endif
>+
> %global gitrev b89c961
> %global hawkey_version 0.4.12
> %global librepo_version 1.4.0
>@@ -5,96 +11,108 @@
> 
> %global confdir %{_sysconfdir}/dnf
> 
>-Name:		dnf
>-Version:	0.4.19
>-Release:	1%{?dist}
>-Summary:	Package manager forked from Yum, using libsolv as a dependency resolver
>-Group:		System Environment/Base
>+Name:       dnf
>+Version:    0.4.19
>+Release:    2%{?dist}
>+Summary:    Package manager forked from Yum, using libsolv as a dependency resolver
>+Group:      System Environment/Base
> # For a breakdown of the licensing, see PACKAGE-LICENSING
>-License:	GPLv2+ and GPLv2 and GPL
>-URL:		https://github.com/akozumpl/dnf
>-Source0:	http://akozumpl.fedorapeople.org/dnf-%{gitrev}.tar.xz
>-BuildArch:	noarch
>-BuildRequires:	cmake
>-BuildRequires:	python2
>-BuildRequires:	python-bugzilla
>-BuildRequires:	python-hawkey >= %{hawkey_version}
>-BuildRequires:	python-iniparse
>-BuildRequires:	python-libcomps >= %{libcomps_version}
>-BuildRequires:	python-librepo >= %{librepo_version}
>+License:    GPLv2+ and GPLv2 and GPL
>+URL:        https://github.com/akozumpl/dnf
>+Source0:    http://akozumpl.fedorapeople.org/dnf-%{gitrev}.tar.xz
>+BuildArch:  noarch
>+BuildRequires:  cmake
>+BuildRequires:  python2
>+BuildRequires:  python-bugzilla
>+BuildRequires:  python-hawkey >= %{hawkey_version}
>+BuildRequires:  python-iniparse
>+BuildRequires:  python-libcomps >= %{libcomps_version}
>+BuildRequires:  python-librepo >= %{librepo_version}
> BuildRequires:  python-nose
> BuildRequires:  python-sphinx
> BuildRequires:  rpm-python
> BuildRequires:  systemd
> BuildRequires:  gettext
>-Requires:	deltarpm
>-Requires:	libreport-filesystem
>-Requires:	python-hawkey >= %{hawkey_version}
>-Requires:	python-iniparse
>-Requires:	python-libcomps >= %{libcomps_version}
>-Requires:	python-librepo >= %{librepo_version}
>-Requires:	rpm-python
>-Requires(post):		systemd
>-Requires(preun):	systemd
>-Requires(postun):	systemd
>+Requires:    deltarpm
>+Requires:    libreport-filesystem
>+Requires:    python-hawkey >= %{hawkey_version}
>+Requires:    python-iniparse
>+Requires:    python-libcomps >= %{libcomps_version}
>+Requires:    python-librepo >= %{librepo_version}
>+Requires:    rpm-python
>+Requires(post):     systemd
>+Requires(preun):    systemd
>+Requires(postun):   systemd
> 
> %description
> Package manager forked from Yum, using libsolv as a dependency resolver.
> 
>+%if %{with python3}
> %package -n python3-dnf
>-Summary:	Package manager forked from Yum, using libsolv as a dependency resolver
>-Group:		System Environment/Base
>-BuildRequires:	python3
>-BuildRequires:	python3-devel
>-BuildRequires:	python3-hawkey >= %{hawkey_version}
>-BuildRequires:	python3-iniparse
>-BuildRequires:	python3-libcomps >= %{libcomps_version}
>-BuildRequires:	python3-librepo >= %{librepo_version}
>-BuildRequires:	python3-nose
>-BuildRequires:	rpm-python3
>-Requires:	python3-hawkey >= %{hawkey_version}
>-Requires:	python3-iniparse
>-Requires:	python3-libcomps >= %{libcomps_version}
>-Requires:	python3-librepo >= %{librepo_version}
>-Requires:	rpm-python3
>+Summary:    Package manager forked from Yum, using libsolv as a dependency resolver
>+Group:        System Environment/Base
>+BuildRequires:    python3
>+BuildRequires:    python3-devel
>+BuildRequires:    python3-hawkey >= %{hawkey_version}
>+BuildRequires:    python3-iniparse
>+BuildRequires:    python3-libcomps >= %{libcomps_version}
>+BuildRequires:    python3-librepo >= %{librepo_version}
>+BuildRequires:    python3-nose
>+BuildRequires:    rpm-python3
>+Requires:    python3-hawkey >= %{hawkey_version}
>+Requires:    python3-iniparse
>+Requires:    python3-libcomps >= %{libcomps_version}
>+Requires:    python3-librepo >= %{librepo_version}
>+Requires:    rpm-python3
> 
> %description -n python3-dnf
> Package manager forked from Yum, using libsolv as a dependency resolver.
>+%endif
> 
> %prep
> %setup -q -n dnf
>+%if %{with python3}
> rm -rf py3
> mkdir ../py3
> cp -a . ../py3/
> mv ../py3 ./
>+%endif
> 
> %build
> %cmake .
> make %{?_smp_mflags}
> make doc-man
>+%if %{with python3}
> pushd py3
> %cmake -DPYTHON_DESIRED:str=3 -DWITH_MAN=0 .
> make %{?_smp_mflags}
> popd
>+%endif
> 
> %install
> rm -rf $RPM_BUILD_ROOT
> make install DESTDIR=$RPM_BUILD_ROOT
> %find_lang %{name}
>+%if %{with python3}
> pushd py3
> make install DESTDIR=$RPM_BUILD_ROOT
> popd
>+%endif
> 
> %global py2pluginpath %{python_sitelib}/dnf-plugins
>-%global py3pluginpath %{python3_sitelib}/dnf-plugins
> mkdir -p $RPM_BUILD_ROOT%{py2pluginpath}
>+%if %{with python3}
>+%global py3pluginpath %{python3_sitelib}/dnf-plugins
> mkdir -p $RPM_BUILD_ROOT%{py3pluginpath}
>+%endif
> 
> %check
> make ARGS="-V" test
>+%if %{with python3}
> pushd py3
> make ARGS="-V" test
> popd
>+%endif
> 
> %files -f %{name}.lang
> %doc AUTHORS README.rst COPYING PACKAGE-LICENSING
>@@ -110,6 +128,7 @@ popd
> %{python_sitelib}/dnf/
> %{py2pluginpath}
> 
>+%if %{with python3}
> %files -n python3-dnf -f %{name}.lang
> %doc AUTHORS README.rst COPYING PACKAGE-LICENSING
> %{_bindir}/dnf
>@@ -122,6 +141,7 @@ popd
> %{_unitdir}/dnf-makecache.timer
> %{python3_sitelib}/dnf/
> %{py3pluginpath}
>+%endif
> 
> %post
> %systemd_post dnf-makecache.timer
>@@ -133,6 +153,9 @@ popd
> %systemd_postun_with_restart dnf-makecache.timer
> 
> %changelog
>+* Thu Mar 27 2014 MatÄj Cepl <mcepl@redhat.com> - 0.4.19-2
>+- Make building python3 components optional.
>+- Replace TABs with spaces.
> 
> * Mon Mar 24 2014 AleÅ¡ KozumplÃk <ales@redhat.com> - 0.4.19-1
> - downloads: bump number of downloaded files on a skip. (RhBug:1079621) (Ales Kozumplik)
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1081572: 879524