From: Jan Rękorajski Date: Thu, 5 May 2016 15:04:30 +0000 (+0200) Subject: - fix python binding install X-Git-Tag: auto/th/mythtv-0.26.1-6 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmythtv.git;a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fmythtv-0.26.1-6 - fix python binding install - rel 6 --- diff --git a/mythtv.spec b/mythtv.spec index 872a11c..3361eeb 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -52,7 +52,7 @@ Summary: A personal video recorder (PVR) application Summary(pl.UTF-8): Osobista aplikacja do nagrywania obrazu (PVR) Name: mythtv Version: 0.26.1 -Release: 5 +Release: 6 License: GPL v2 Group: Applications/Multimedia Source0: ftp://ftp.osuosl.org/pub/mythtv/%{name}-%{version}.tar.bz2 @@ -69,6 +69,7 @@ Source20: dshowcodecs # Source20-md5: 48327772b9e150f69e1ab8ff44b9a76c Patch0: %{name}-configure.patch Patch1: system-zeromq.patch +Patch2: python-install.patch Patch20: %{name}-compile_fixes_for_qt_4_7.patch Patch30: %{name}-dshowserver-0.22.patch URL: http://www.mythtv.org/ @@ -363,6 +364,7 @@ Ten pakiet zawiera moduły PHP do tworzenia dodatków dla mythtv. %patch0 -p1 %patch1 -p1 +%patch2 -p1 %{?with_dshowserver:%patch20 -p1} #%patch30 -p1 @@ -487,6 +489,8 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,sysconfig} \ $RPM_BUILD_ROOT/usr/lib/tmpfiles.d %{__make} install \ + py_sitescriptdir=%{py_sitescriptdir} \ + py_sitedir=%{py_sitedir} \ INSTALL_ROOT=$RPM_BUILD_ROOT # Install the files that we added on top of mythtv's own stuff diff --git a/python-install.patch b/python-install.patch new file mode 100644 index 0000000..cbf129d --- /dev/null +++ b/python-install.patch @@ -0,0 +1,24 @@ +--- mythtv-0.26.1/bindings/python/Makefile.orig 2013-08-15 16:44:02.000000000 +0200 ++++ mythtv-0.26.1/bindings/python/Makefile 2016-05-05 16:53:57.760298186 +0200 +@@ -5,11 +5,7 @@ + endif + + REAL_PREFIX = $(PREFIX) +-ifneq ($(PREFIX:/=), /usr) +- ifneq ($(PREFIX:/=), /usr/local) +- PREFIX_FLAGS=--prefix="$(PREFIX)" +- endif +-endif ++PREFIX_FLAGS=--prefix="$(PREFIX)" + + all: python_build + +@@ -22,7 +18,7 @@ + $(PYTHON) setup.py build --mythtv-prefix="$(REAL_PREFIX)" + + install: setup.py +- $(PYTHON) setup.py install --skip-build $(ROOT_FLAGS) $(PREFIX_FLAGS) ++ $(PYTHON) setup.py install --skip-build $(ROOT_FLAGS) --install-purelib=$(py_sitescriptdir) --install-platlib=$(py_sitedir) $(PREFIX_FLAGS) + + ifdef INSTALL_ROOT + uninstall: