diff --git a/0001-Use-a-slightly-better-strategy-for-symlinking-althou.patch b/0001-Use-a-slightly-better-strategy-for-symlinking-althou.patch new file mode 100644 index 0000000..254d63d --- /dev/null +++ b/0001-Use-a-slightly-better-strategy-for-symlinking-althou.patch @@ -0,0 +1,30 @@ +From 4e8ee28f3a314edef2a8489854c0ed58ac668070 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Fri, 4 Jan 2013 20:31:12 +0100 +Subject: [PATCH] Use a slightly better strategy for symlinking: although the + previous code working locally, distribution users had issues in it not + properly working. + +Patch by Raymond Wooninck. + +CCMAIL: kde-packager@kde.org +--- + tools/pykdeuic4/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/pykdeuic4/CMakeLists.txt b/tools/pykdeuic4/CMakeLists.txt +index 2209fba..092985d 100644 +--- a/tools/pykdeuic4/CMakeLists.txt ++++ b/tools/pykdeuic4/CMakeLists.txt +@@ -10,7 +10,7 @@ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PA + + if (NOT PYKDEUIC4_ALTINSTALL) + # Step 2: Make a the generated symlink a link to "pykdeuic4" +- install(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${BIN_INSTALL_DIR}/${_uic_name} ${BIN_INSTALL_DIR}/pykdeuic4)" ) ++ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${BIN_INSTALL_DIR}/${_uic_name} -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) + endif() + + unset(_uic_name) +-- +1.8.1 + diff --git a/pykde4.spec b/pykde4.spec index d734dd3..ea92fe2 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -8,7 +8,7 @@ Name: pykde4 Version: 4.9.97 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python bindings for KDE4 # http://techbase.kde.org/Policies/Licensing_Policy @@ -22,7 +22,12 @@ URL: http://developer.kde.org/language-bindings/ %endif Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz +## upstreamable patches +# fix kpythonpluginfactory, http://bugs.kde.org/312618 +Patch50: pykde4-4.9.97-kde312618.patch + ## upstream patches +Patch100: 0001-Use-a-slightly-better-strategy-for-symlinking-althou.patch # debian patches Patch200: pykde4-4.9.90-respect_sip_flags.patch @@ -135,6 +140,9 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} %prep %setup -q -n pykde4-%{version} +%patch50 -p1 -b .kde312618 +%patch100 -p1 -b .0001 + %patch200 -p1 -b .respect_sip_flags %patch201 -p1 -b .kpythonpluginfactory_slots @@ -148,6 +156,7 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} mkdir -p %{_target_platform}-python3 pushd %{_target_platform}-python3 %{cmake_kde4} \ + -DPYKDEUIC4_ALTINSTALL:BOOL=ON \ -DPYTHON_EXECUTABLE:PATH=%{__python3} \ .. @@ -158,6 +167,7 @@ popd mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake_kde4} \ + -DPYKDEUIC4_ALTINSTALL:BOOL=ON \ -DPYTHON_EXECUTABLE:PATH=%{__python} \ .. @@ -193,6 +203,7 @@ mv %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py \ %{buildroot}%{_bindir}/pykdeuic4-%{python_version} ln -s %{_bindir}/pykdeuic4-%{python_version} \ %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py +ln -s pykdeuic4-%{python_version} %{buildroot}%{_bindir}/pykdeuic4 # install pykde4 examples under correct dir mkdir -p %{buildroot}%{_docdir}/pykde4 @@ -213,6 +224,7 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/ %endif %files devel +%{_kde4_bindir}/pykdeuic4 %{_kde4_bindir}/pykdeuic4-%{python_version} %{python_sitearch}/PyQt4/uic/pykdeuic4.py* %{_docdir}/pykde4/examples/ @@ -241,6 +253,9 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/ %changelog +* Mon Jan 07 2013 Rex Dieter 4.9.97-3 +- fix kpythonpluginfactory (kde#312618) + * Fri Jan 04 2013 Rex Dieter 4.9.97-2 - fixup/cleanup pykdeuic4 naming and multilib-hackery