diff --git a/pykde4-4.12.3-python_library_realpath.patch b/pykde4-4.12.3-python_library_realpath.patch new file mode 100644 index 0000000..5e7eb14 --- /dev/null +++ b/pykde4-4.12.3-python_library_realpath.patch @@ -0,0 +1,13 @@ +diff -up pykde4-4.12.3/kpythonpluginfactory/CMakeLists.txt.python_library_realpath pykde4-4.12.3/kpythonpluginfactory/CMakeLists.txt +--- pykde4-4.12.3/kpythonpluginfactory/CMakeLists.txt.python_library_realpath 2014-01-18 13:18:35.000000000 -0600 ++++ pykde4-4.12.3/kpythonpluginfactory/CMakeLists.txt 2014-03-07 22:38:06.228544932 -0600 +@@ -3,7 +3,8 @@ + set(kpythonpluginfactory_SRCS + kpythonpluginfactory.cpp) + +-GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARIES} NAME) ++GET_FILENAME_COMPONENT(PYTHON_LIBRARY_REALPATH "${PYTHON_LIBRARY}" REALPATH) ++GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY_REALPATH} NAME) + ADD_DEFINITIONS(-DLIB_PYTHON="${LIB_PYTHON}") + ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000) + diff --git a/pykde4.spec b/pykde4.spec index 2e28fd6..c6516b0 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -10,7 +10,7 @@ Name: pykde4 Version: 4.12.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python bindings for KDE4 # http://techbase.kde.org/Policies/Licensing_Policy @@ -29,6 +29,8 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar Patch1: 0001-Ensure-SIP-files-are-installed-to-the-right-path-bas.patch ## upstreamable patches +# see also https://bugzilla.redhat.com/show_bug.cgi?id=1050944 +Patch50: pykde4-4.12.3-python_library_realpath.patch ## upstream patches @@ -36,7 +38,6 @@ Patch1: 0001-Ensure-SIP-files-are-installed-to-the-right-path-bas.patch Patch201: add_qt_kde_definitions.diff Patch202: fix_kpythonpluginfactory_build.diff Patch203: make_pykde4_respect_sip_flags.diff -Patch204: pythonpluginfactory_use_versioned_python_lib.diff # rebased pythonpluginfactory_python3.diff Patch207: pykde4-4.11.2-pythonpluginfactory_python3.patch Patch209: kubuntu_kpythonpluginfactory_3.2support.diff @@ -143,12 +144,11 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} %setup -q -n pykde4-%{version} %patch1 -p1 -R -b .use_system_sip_dir +%patch50 -p1 -b .python_library_realpath %patch201 -p1 -b .201 %patch202 -p1 -b .202 %patch203 -p1 -b .203 -# we set explicit PYTHON_LIBRARY below, so can avoid this -#patch204 -p1 -b .204 # omit these for now, needs work -- rex #patch207 -p1 -b .207 #patch209 -p1 -b .209 @@ -164,7 +164,6 @@ mkdir -p %{_target_cpu}-python3 pushd %{_target_cpu}-python3 %{cmake_kde4} \ -DPYTHON_EXECUTABLE:PATH=%{__python3} \ - -DPYTHON_LIBRARY:PATH=%{_libdir}/libpython%{python3_version}%{?python3_abiflags}.so.1.0 \ .. make %{?_smp_mflags} @@ -175,8 +174,7 @@ mkdir -p %{_target_cpu} pushd %{_target_cpu} %{cmake_kde4} \ -DPYKDEUIC4_ALTINSTALL:BOOL=ON \ - -DPYTHON_EXECUTABLE:PATH=%{__python} \ - -DPYTHON_LIBRARY:PATH=%{_libdir}/libpython%{python_version}.so.1.0 \ + -DPYTHON_EXECUTABLE:PATH=%{?__python2}%{!?__python2:%{__python}} \ .. make %{?_smp_mflags} @@ -290,6 +288,9 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/ %changelog +* Fri Mar 07 2014 Rex Dieter 4.12.3-2 +- python_library_realpath.patch + * Sat Mar 01 2014 Rex Dieter - 4.12.3-1 - 4.12.3 diff --git a/pythonpluginfactory_use_versioned_python_lib.diff b/pythonpluginfactory_use_versioned_python_lib.diff deleted file mode 100644 index 7aa65a0..0000000 --- a/pythonpluginfactory_use_versioned_python_lib.diff +++ /dev/null @@ -1,21 +0,0 @@ -From: Sune Vuorela -Subject: Make kpythonfactory dlopen versioned python library. -Bug-Debian: http://bugs.debian.org/524685 -Bug-Debian: http://bugs.debian.org/541999 -Last-Update: 2009-09-19 -Forwarded: no -Origin: vendor - -Otherwise, python-dev would be needed for Python Plugin factory to work. - ---- a/kpythonpluginfactory/kpythonpluginfactory.cpp -+++ b/kpythonpluginfactory/kpythonpluginfactory.cpp -@@ -307,7 +307,7 @@ QLibrary *LoadPythonLibrary() - { - QLibrary *pythonLib = new QLibrary(); - pythonLib->setLoadHints(QLibrary::ExportExternalSymbolsHint); -- pythonLib->setFileName(LIB_PYTHON); -+ pythonLib->setFileName(LIB_PYTHON ".1"); - pythonLib->load(); - return pythonLib; - }