[PyQt4] simpler approach, avoid symlink and just copy
Rex Dieter
rdieter at fedoraproject.org
Fri Mar 14 15:53:38 UTC 2014
commit d9c2fdf2eccb8f5186d588b3ef1354d6d51a2be7
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Mar 14 10:53:02 2014 -0500
simpler approach, avoid symlink and just copy
PyQt4.spec | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/PyQt4.spec b/PyQt4.spec
index 7511fe1..5a0e1a5 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -250,14 +250,11 @@ touch %{buildroot}%{python_sitearch}/_dbus_qt/__init__.py
echo 'from _dbus_qt.qt import *' > %{buildroot}%{python_sitelib}/dbus/mainloop/qt.py
# fix multilb conflict (symlink pointing to python_sitearch)
-# by moving content to python_sitelib instead, see
+# by avoiding symlinks and just copy pyuic
# http://bugzilla.redhat.com/509415
# and followup
# https://bugzilla.redhat.com/1076346
-mkdir -p %{buildroot}%{python_sitelib}/PyQt4/uic
-mv %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py
- %{buildroot}%{python_sitelib}/PyQt4/uic/pyuic.py
-ln -sf %{python_sitelib}/PyQt4/uic/pyuic.py
+cp -a %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py \
%{buildroot}%{_bindir}/pyuic4
# remove Python 3 code from Python 2.6 directory, fixes FTBFS (#564633)
@@ -316,7 +313,6 @@ diff -u ./sip/QtOpenGL/opengl_types.sip.orig \
%{python_sitearch}/PyQt4/QtXml.so
%{python_sitearch}/PyQt4/QtXmlPatterns.so
%{python_sitearch}/PyQt4/uic/
-%{python_sitelib}/PyQt4/uic/
%{python_sitearch}/_dbus_qt/
%{python_sitelib}/dbus/mainloop/qt.py*
%{_qt4_plugindir}/designer/*
More information about the scm-commits
mailing list