Hello community,

here is the log from the commit of package qscintilla for openSUSE:Factory 
checked in at 2017-04-17 10:25:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qscintilla (Old)
 and      /work/SRC/openSUSE:Factory/.qscintilla.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qscintilla"

Mon Apr 17 10:25:14 2017 rev:47 rq:479820 version:2.9.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/qscintilla/qscintilla.changes    2017-01-20 
13:07:17.710622833 +0100
+++ /work/SRC/openSUSE:Factory/.qscintilla.new/qscintilla.changes       
2017-04-17 10:25:24.241923063 +0200
@@ -1,0 +2,5 @@
+Sun Mar 12 16:15:39 UTC 2017 - [email protected]
+
+- Implement single-spec version
+
+-------------------------------------------------------------------

Old:
----
  python3-qscintilla.changes
  python3-qscintilla.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-qscintilla.spec ++++++
--- /var/tmp/diff_new_pack.oq6IJY/_old  2017-04-17 10:25:25.145795057 +0200
+++ /var/tmp/diff_new_pack.oq6IJY/_new  2017-04-17 10:25:25.145795057 +0200
@@ -16,6 +16,7 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-qscintilla
 Version:        2.9.4
 Release:        0
@@ -26,57 +27,89 @@
 Source:         
http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{version}/QScintilla_gpl-%{version}.tar.gz
 BuildRequires:  libdrm-devel
 BuildRequires:  libqscintilla-devel
-BuildRequires:  python-devel
-BuildRequires:  python-qt4-devel
-BuildRequires:  python-sip-devel >= 4.19.1
+BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module qt4-devel}
+BuildRequires:  %{python_module sip-devel >= 4.19.1}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%requires_ge    python-qt4
-%requires_ge    python-sip >= 4.19.1
+Requires:       %{name}-sip = %{version}
+%ifpython2
+%requires_ge    python2-qt4
+%{requires_python2_sip_api}
+%endif
+%ifpython3
+%requires_ge    python3-qt4
+%{requires_python3_sip_api}
+%endif
 %requires_ge    libqt4-x11
 
+%python_subpackages
+
 %description
 QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
 
 This is a Qt port from the original Scintilla class
 (http://www.scintilla.org/).
 
-This package is mainly used by eric, the Python IDE.
 
-%package sip
+%package -n %{name}-sip
 Summary:        sip files for PyQScintilla
 Group:          Development/Libraries/Python
+Provides:       %{python_module qscintilla-sip = %{version}}
+
+%description -n %{name}-sip
+QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
+
+This is a Qt port from the original Scintilla class
+(http://www.scintilla.org/).
+
+This package contains sip files used to generate bindings to
+QScintilla.
 
-%description sip
-This package is needed to avoid conflicts between python-qscintilla and
-python3-qscintilla packages. It contains sip files  used to generate
-bindings to QScintilla
 
 %prep
 %setup -q -n QScintilla_gpl-%{version}
 
+
 %build
-pushd Python
-python configure.py
+%{python_expand cp -r Python Python_%{$python_bin_suffix}
+pushd Python_%{$python_bin_suffix}
+
+$python configure.py
+
 make %{?_smp_mflags}
+
 popd
 
+}
+
+
 %install
-pushd Python
-make DESTDIR=%{buildroot} install %{?_smp_mflags} INSTALL_ROOT=%{buildroot}
+%{python_expand pushd Python_%{$python_bin_suffix}
+
+%make_install INSTALL_ROOT=%{buildroot}
+
 popd
 
-%files
+mv -T %{buildroot}%{_datadir}/qt4/qsci/api/python 
%{buildroot}%{_datadir}/qt4/qsci/api/python_%{$python_bin_suffix}
+
+}
+
+
+%files %{python_files}
 %defattr(-,root,root)
 %doc NEWS README LICENSE
 %{python_sitearch}/PyQt4/Qsci.so
 %{python_sitearch}/PyQt4/Qsci.pyi
-%{_datadir}/qt4/qsci
-%{_datadir}/qt4/qsci/api
-%{_datadir}/qt4/qsci/api/python
-%{_datadir}/qt4/qsci/api/python/QScintilla2.api
+%dir %{_datadir}/qt4/qsci/
+%dir %{_datadir}/qt4/qsci/api/
+%dir %{_datadir}/qt4/qsci/api/python_%{python_bin_suffix}/
+%{_datadir}/qt4/qsci/api/python_%{python_bin_suffix}/QScintilla2.api
 
-%files sip
+
+%files -n %{name}-sip
 %defattr(-,root,root)
 %{_datadir}/sip/PyQt4/Qsci
 
+
 %changelog


Reply via email to