Attachment 879435 Details for Bug 1081473 – suggested patch

[patch] suggested patch

0005-Make-building-of-python3-components-conditional.patch (text/plain), 4.80 KB, created by Matěj Cepl on 2014-03-27 12:21:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2014-03-27 12:21:32 UTC

Size: 4.80 KB

patch

obsolete

>From 8ae59d857143a538e0c55f406a003e67ba13b929 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
>Date: Thu, 27 Mar 2014 13:16:27 +0100
>Subject: [PATCH 5/5] Make building of python3 components conditional
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Also, replace all TABs with spaces
>
>Signed-off-by: MatÄj Cepl <mcepl@redhat.com>
>---
> librepo.spec | 84 ++++++++++++++++++++++++++++++++++++++----------------------
> 1 file changed, 54 insertions(+), 30 deletions(-)
>
>diff --git a/librepo.spec b/librepo.spec
>index 2dc5db6..6c7d1b6 100644
>--- a/librepo.spec
>+++ b/librepo.spec
>@@ -1,33 +1,41 @@
>+%if 0%{?rhel} <= 7
>+%bcond_with python3
>+%else
>+%bcond_without python3
>+%endif
>+
> %global gitrev 2b2c02f
> # gitrev is output of: git rev-parse --short HEAD
> 
>-Name:		librepo
>-Version:	1.6.0
>-Release:	1%{?dist}
>-Summary:	Repodata downloading library
>+Name:       librepo
>+Version:    1.6.0
>+Release:    2%{?dist}
>+Summary:    Repodata downloading library
> 
>-Group:		System Environment/Libraries
>-License:	GPLv2+
>-URL:		https://github.com/Tojaj/librepo
>+Group:      System Environment/Libraries
>+License:    GPLv2+
>+URL:        https://github.com/Tojaj/librepo
> # Use the following commands to generate the tarball:
> #  git clone https://github.com/Tojaj/librepo.git
> #  cd librepo
> #  utils/make_tarball.sh %{gitrev}
>-Source0:	librepo-%{gitrev}.tar.xz
>-
>-BuildRequires:	check-devel
>-BuildRequires:	cmake
>-BuildRequires:	doxygen
>-BuildRequires:	expat-devel
>-BuildRequires:  glib2-devel >= 2.22.0
>-BuildRequires:	gpgme-devel
>-BuildRequires:	libattr-devel
>-BuildRequires:	libcurl-devel
>-BuildRequires:	openssl-devel
>+Source0:    librepo-%{gitrev}.tar.xz
>+
>+BuildRequires:    check-devel
>+BuildRequires:    cmake
>+BuildRequires:    doxygen
>+BuildRequires:    expat-devel
>+BuildRequires:    glib2-devel >= 2.22.0
>+BuildRequires:    gpgme-devel
>+BuildRequires:    libattr-devel
>+BuildRequires:    libcurl-devel
>+BuildRequires:    openssl-devel
> 
> # prevent provides from nonstandard paths:
> %filter_provides_in %{python_sitearch}/.*\.so$
>+%if %{with python3}
> %filter_provides_in %{python3_sitearch}/.*\.so$
>+%endif
> %filter_setup
> 
> %description
>@@ -35,30 +43,31 @@ A library providing C and Python (libcURL like) API to downloading repository
> metadata.
> 
> %package devel
>-Summary:	Repodata downloading library
>-Group:		Development/Libraries
>-Requires:	%{name}%{?_isa} = %{version}-%{release}
>+Summary:      Repodata downloading library
>+Group:        Development/Libraries
>+Requires:     %{name}%{?_isa} = %{version}-%{release}
> 
> %description devel
> Development files for librepo.
> 
> %package -n python-librepo
>-Summary:	Python bindings for the librepo library
>-Group:		Development/Languages
>-BuildRequires:	pygpgme
>-BuildRequires:	python2-devel
>-BuildRequires:	python-flask
>-BuildRequires:	python-nose
>-BuildRequires:	python-sphinx
>-Requires:	%{name}%{?_isa} = %{version}-%{release}
>+Summary:    Python bindings for the librepo library
>+Group:      Development/Languages
>+BuildRequires:    pygpgme
>+BuildRequires:    python2-devel
>+BuildRequires:    python-flask
>+BuildRequires:    python-nose
>+BuildRequires:    python-sphinx
>+Requires:    %{name}%{?_isa} = %{version}-%{release}
> 
> %description -n python-librepo
> Python bindings for the librepo library.
> 
>+%if %{with python3}
> %package -n python3-librepo
> Summary:        Python 3 bindings for the librepo library
> Group:          Development/Languages
>-BuildRequires:	python3-pygpgme
>+BuildRequires:  python3-pygpgme
> BuildRequires:  python3-devel
> BuildRequires:  python3-flask
> BuildRequires:  python3-nose
>@@ -67,36 +76,45 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
> 
> %description -n python3-librepo
> Python 3 bindings for the librepo library.
>+%endif
> 
> %prep
> %setup -q -n librepo
> 
>+%if %{with python3}
> rm -rf py3
> mkdir ../py3
> cp -a . ../py3/
> mv ../py3 ./
>+%endif
> 
> %build
> %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
> make %{?_smp_mflags}
> 
>+%if %{with python3}
> pushd py3
> %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPYTHON_DESIRED:str=3 .
> make %{?_smp_mflags}
> popd
>+%endif
> 
> %check
> make ARGS="-V" test
> 
>+%if %{with python3}
> pushd py3
> make ARGS="-V" test
> popd
>+%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
> 
>@@ -114,10 +132,16 @@ popd
> %files -n python-librepo
> %{python_sitearch}/librepo/
> 
>+%if %{with python3}
> %files -n python3-librepo
> %{python3_sitearch}/
>+%endif
> 
> %changelog
>+* Thu Mar 27 2014 MatÄj Cepl <mcepl@redhat.com> - 1.6.0-2
>+- Make building of python3 components conditional
>+- replace all TABs with spaces
>+
> * Tue Feb  20 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 1.6.0-1
> - Small API change: End callback now must return integer and not void)
> - downloader: Check for the lr_interrupt regularly
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1081473: 879435