[qscintilla] fix .api file mess
Rex Dieter
rdieter at fedoraproject.org
Tue Mar 5 13:19:33 UTC 2013
commit e74cc8ac06b33e6ab0b4edbb88b3ff497c54283f
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Mar 5 07:18:24 2013 -0600
fix .api file mess
fix .api install path
move .api file(s) to -python (from main)
QScintilla-gpl-2.7.1-api_path.patch | 12 ++++++++++++
qscintilla.spec | 8 ++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/QScintilla-gpl-2.7.1-api_path.patch b/QScintilla-gpl-2.7.1-api_path.patch
new file mode 100644
index 0000000..7050ae8
--- /dev/null
+++ b/QScintilla-gpl-2.7.1-api_path.patch
@@ -0,0 +1,12 @@
+diff -up QScintilla-gpl-2.7.1/Python/configure.py.api_path QScintilla-gpl-2.7.1/Python/configure.py
+--- QScintilla-gpl-2.7.1/Python/configure.py.api_path 2013-03-01 15:03:05.000000000 -0600
++++ QScintilla-gpl-2.7.1/Python/configure.py 2013-03-05 07:10:55.893278144 -0600
+@@ -265,7 +265,7 @@ class TargetConfiguration:
+ "working Qt qmake.")
+
+ qt_config = TargetQtConfiguration(self.qmake)
+- self.api_dir = qt_config.QT_INSTALL_DATA
++ self.api_dir = os.path.join(qt_config.QT_INSTALL_DATA, 'qsci')
+ self.qsci_inc_dir = qt_config.QT_INSTALL_HEADERS
+ self.qsci_lib_dir = qt_config.QT_INSTALL_LIBS
+
diff --git a/qscintilla.spec b/qscintilla.spec
index 929d04b..bd9bde8 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -16,6 +16,7 @@ Source0: http://downloads.sf.net/pyqt/QScintilla-gpl-%{version}.tar.gz
## Upstreamable patches
Patch50: QScintilla-gpl-2.7.1-qt4qt5_designer_incpath.patch
+Patch51: QScintilla-gpl-2.7.1-api_path.patch
BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtScript) pkgconfig(QtXml)
@@ -57,6 +58,7 @@ BuildArch: noarch
%setup -q -n QScintilla-gpl-%{version}
%patch50 -p1 -b .qt4_designer_incpath
+%patch51 -p1 -b .api_path
# fix line endings in license file(s)
sed -i 's/\r//' LICENSE.GPL2 GPL_EXCEPTION_ADDENDUM.TXT
@@ -94,6 +96,9 @@ make -C Qt4Qt5 install INSTALL_ROOT=%{buildroot}
make -C designer-Qt4Qt5 install INSTALL_ROOT=%{buildroot}
%if 0%{?python}
make -C Python install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
+%else
+# unpackaged files
+rm -rf %{buildroot}%{_qt4_datadir}/qsci/
%endif
@@ -107,7 +112,6 @@ make -C Python install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
%{_qt4_libdir}/libqscintilla2.so.9*
%{_qt4_plugindir}/designer/libqscintillaplugin.so
%{_qt4_translationdir}/*
-%{_qt4_prefix}/qsci/
%files devel
%doc doc/html-Qt4Qt5 doc/Scintilla example-Qt4Qt5
@@ -117,10 +121,10 @@ make -C Python install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
%if 0%{?python}
%files python
%{python_sitearch}/PyQt4/Qsci.so
+%{_qt4_datadir}/qsci/
%files python-devel
%{_datadir}/sip/PyQt4/Qsci/
-%{_qt4_prefix}/api/python/QScintilla2.api
%endif
More information about the scm-commits
mailing list