Attachment 879432 Details for Bug 1081456 – suggested patch

[patch] suggested patch

0001-Make-building-of-python3-related-packages-conditiona.patch (text/plain), 4.65 KB, created by Matěj Cepl on 2014-03-27 12:05:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2014-03-27 12:05:55 UTC

Size: 4.65 KB

patch

obsolete

>From 8c2317675b1821ec0a92cbdc34beceb23bd32fb8 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
>Date: Thu, 27 Mar 2014 13:02:53 +0100
>Subject: [PATCH] Make building of python3 related packages conditional.
>
>Also, remove all TABs
>---
> hawkey.spec | 73 +++++++++++++++++++++++++++++++++++++++----------------------
> 1 file changed, 47 insertions(+), 26 deletions(-)
>
>diff --git a/hawkey.spec b/hawkey.spec
>index dd2a51a..5681f96 100644
>--- a/hawkey.spec
>+++ b/hawkey.spec
>@@ -1,88 +1,106 @@
>+%if 0%{?rhel} <= 7
>+%bcond_with python3
>+%else
>+%bcond_without python3
>+%endif
>+
> %global gitrev f5edea1
> %global libsolv_version 0.4.0-2
> 
>-Name:		hawkey
>-Version:	0.4.12
>-Release:	1%{?dist}
>-Summary:	Library providing simplified C and Python API to libsolv
>-Group:		System Environment/Libraries
>-License:	LGPLv2+
>-URL:		https://github.com/akozumpl/hawkey
>+Name:        hawkey
>+Version:    0.4.12
>+Release:    2%{?dist}
>+Summary:    Library providing simplified C and Python API to libsolv
>+Group:        System Environment/Libraries
>+License:    LGPLv2+
>+URL:        https://github.com/akozumpl/hawkey
> # git clone https://github.com/akozumpl/hawkey.git && cd hawkey && package/archive
>-Source0:	hawkey-%{gitrev}.tar.xz
>-BuildRequires:	libsolv-devel >= %{libsolv_version}
>-BuildRequires:	cmake expat-devel rpm-devel zlib-devel check-devel
>-Requires:	libsolv%{?_isa} >= %{libsolv_version}
>+Source0:    hawkey-%{gitrev}.tar.xz
>+BuildRequires:    libsolv-devel >= %{libsolv_version}
>+BuildRequires:    cmake expat-devel rpm-devel zlib-devel check-devel
>+Requires:    libsolv%{?_isa} >= %{libsolv_version}
> # prevent provides from nonstandard paths:
> %filter_provides_in %{python_sitearch}/.*\.so$
>-%filter_provides_in %{python3_sitearch}/.*\.so$
> # filter out _hawkey_testmodule.so DT_NEEDED _hawkeymodule.so:
> %filter_requires_in %{python_sitearch}/hawkey/test/.*\.so$
>+%if %{with python3}
>+%filter_provides_in %{python3_sitearch}/.*\.so$
> %filter_requires_in %{python3_sitearch}/hawkey/test/.*\.so$
>+%endif
> %filter_setup
> 
> %description
> A Library providing simplified C and Python API to libsolv.
> 
> %package devel
>-Summary:	A Library providing simplified C and Python API to libsolv
>-Group:		Development/Libraries
>-Requires:	hawkey%{?_isa} = %{version}-%{release}
>-Requires:	libsolv-devel
>+Summary:    A Library providing simplified C and Python API to libsolv
>+Group:        Development/Libraries
>+Requires:    hawkey%{?_isa} = %{version}-%{release}
>+Requires:    libsolv-devel
> 
> %description devel
> Development files for hawkey.
> 
> %package -n python-hawkey
>-Summary:	Python 2 bindings for the hawkey library
>-Group:		Development/Languages
>+Summary:    Python 2 bindings for the hawkey library
>+Group:        Development/Languages
> BuildRequires:  python2-devel
> BuildRequires:  python-nose
> BuildRequires:  python-sphinx
>-Requires:	%{name}%{?_isa} = %{version}-%{release}
>+Requires:    %{name}%{?_isa} = %{version}-%{release}
> 
> %description -n python-hawkey
> Python 2 bindings for the hawkey library.
> 
>+%if %{with python3}
> %package -n python3-hawkey
>-Summary:	Python 3 bindings for the hawkey library
>-Group:		Development/Languages
>-BuildRequires:	python3-devel
>-BuildRequires:	python3-nose
>-BuildRequires:	python3-sphinx
>-Requires:	%{name}%{?_isa} = %{version}-%{release}
>+Summary:    Python 3 bindings for the hawkey library
>+Group:        Development/Languages
>+BuildRequires:    python3-devel
>+BuildRequires:    python3-nose
>+BuildRequires:    python3-sphinx
>+Requires:    %{name}%{?_isa} = %{version}-%{release}
> 
> %description -n python3-hawkey
> Python 3 bindings for the hawkey library.
>+%endif
> 
> %prep
> %setup -q -n hawkey
> 
>+%if %{with python3}
> rm -rf py3
> mkdir ../py3
> cp -a . ../py3/
> mv ../py3 ./
>+%endif
> 
> %build
> %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
> make %{?_smp_mflags}
> make doc-man
> 
>+%if %{with python3}
> pushd py3
> %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPYTHON_DESIRED:str=3.
> make %{?_smp_mflags}
> make doc-man
> popd
>+%endif
> 
> %check
> make ARGS="-V" test
>+%if %{with python3}
> ./py3/tests/python/tests/run_nosetests.sh
>+%endif
> 
> %install
> make install DESTDIR=$RPM_BUILD_ROOT
>+%if %{with python3}
> pushd py3
> make install DESTDIR=$RPM_BUILD_ROOT
> popd
>+%endif
> 
> %post -p /sbin/ldconfig
> 
>@@ -101,13 +119,16 @@ popd
> %files -n python-hawkey
> %{python_sitearch}/
> 
>+%if %{with python3}
> %files -n python3-hawkey
> %{python3_sitearch}/
> %exclude %{python3_sitearch}/hawkey/__pycache__
> %exclude %{python3_sitearch}/hawkey/test/__pycache__
>+%endif
> 
> %changelog
>-
>+* Thu Mar 27 2014 MatÄj Cepl <mcepl@redhat.com> - 0.4.12-2
>+- Make building of python3 related packages conditional.
> 
> * Fri Mar 14 2014 Jan Silhan <jsilhan@redhat.com> - 0.4.12-1
> - Fix hy_stringarray_length. (Radek Holy)
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1081456: 879432