From 9705b1530d6e99bedb1af1d07d31d61b39110445 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 6 May 2016 09:13:50 +0200 Subject: [PATCH] - fix python module install - rel 4 --- deltarpm.spec | 4 +++- python-install.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 python-install.patch diff --git a/deltarpm.spec b/deltarpm.spec index 839724b..5ddd827 100644 --- a/deltarpm.spec +++ b/deltarpm.spec @@ -2,7 +2,7 @@ Summary: Create deltas between rpms Summary(pl.UTF-8): Generowanie różnic między pakietami rpm Name: deltarpm Version: 3.6 -Release: 3 +Release: 4 License: BSD Group: Base Source0: ftp://ftp.suse.com/pub/projects/deltarpm/%{name}-%{version}.tar.bz2 @@ -10,6 +10,7 @@ Source0: ftp://ftp.suse.com/pub/projects/deltarpm/%{name}-%{version}.tar.bz2 Patch0: %{name}-3.4-no-skip-doc.patch Patch1: %{name}-3.4-pld.patch Patch2: %{name}-rpm5.patch +Patch3: python-install.patch URL: http://www.novell.com/products/linuxpackages/opensuse/deltarpm.html BuildRequires: bzip2-devel BuildRequires: popt-devel @@ -78,6 +79,7 @@ Ten pakiet zawiera wiązania Pythona do deltarpm. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %{__sed} -i -e 's/python3//' Makefile diff --git a/python-install.patch b/python-install.patch new file mode 100644 index 0000000..795cd72 --- /dev/null +++ b/python-install.patch @@ -0,0 +1,11 @@ +--- deltarpm-3.6/Makefile~ 2016-05-06 09:12:02.000000000 +0200 ++++ deltarpm-3.6/Makefile 2016-05-06 09:12:37.798574123 +0200 +@@ -79,7 +79,7 @@ + install -m 644 drpmsync.8 $(DESTDIR)$(mandir)/man8 + for PY in $(PYTHONS) ; do \ + if [ -x /usr/bin/$$PY ]; then \ +- PYLIB=`$$PY -c 'from distutils import sysconfig ; print(sysconfig.get_python_lib(1))'` ; \ ++ PYLIB=`$$PY -c 'from distutils import sysconfig ; print(sysconfig.get_python_lib(1,prefix="$(prefix)"))'` ; \ + PYVER=`$$PY -c 'from distutils import sysconfig ; print(sysconfig.get_python_version())'` ; \ + if [ -e python$$PYVER/_deltarpmmodule.so ]; then \ + mkdir -p $(DESTDIR)$(pylibprefix)$$PYLIB ; \ -- 2.44.0