Hello community, here is the log from the commit of package qscintilla for openSUSE:Factory checked in at 2014-11-14 09:19:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qscintilla (Old) and /work/SRC/openSUSE:Factory/.qscintilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qscintilla" Changes: -------- --- /work/SRC/openSUSE:Factory/qscintilla/python-qscintilla.changes 2014-06-16 21:32:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qscintilla.new/python-qscintilla.changes 2014-11-14 09:19:28.000000000 +0100 @@ -2 +2,19 @@ -Thu May 29 02:34:37 UTC 2014 - [email protected] +Sat Oct 11 18:00:02 UTC 2014 - [email protected] + +- Update to 2.8.4 + - This is a minor functional release include the addition of some hotspot + related functions to the high-level API. + - run spec-cleaner + +------------------------------------------------------------------- +Thu Jul 31 08:38:31 UTC 2014 - [email protected] + +- Update to 2.8.3 + - Added the QsciLexerCoffeeScript class. + - Font sizes are now handled as floating point values rather than integers. + - Bug fixes. +- Run spec file through spec-cleaner +- Various spec file cleanups + +------------------------------------------------------------------- +Thu May 29 02:33:33 UTC 2014 - [email protected] python3-qscintilla.changes: same change --- /work/SRC/openSUSE:Factory/qscintilla/qscintilla.changes 2014-06-16 21:32:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qscintilla.new/qscintilla.changes 2014-11-14 09:19:28.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Oct 11 18:00:02 UTC 2014 - [email protected] + +- Update to 2.8.4 + - This is a minor functional release include the addition of some hotspot + related functions to the high-level API. + - run spec-cleaner + +------------------------------------------------------------------- +Thu Jul 31 08:38:31 UTC 2014 - [email protected] + +- Update to 2.8.3 + - Added the QsciLexerCoffeeScript class. + - Font sizes are now handled as floating point values rather than integers. + - Bug fixes. +- Run spec file through spec-cleaner +- Various spec file cleanups + +------------------------------------------------------------------- Old: ---- QScintilla-gpl-2.8.2.tar.gz New: ---- QScintilla-gpl-2.8.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.hqPsbf/_old 2014-11-14 09:19:29.000000000 +0100 +++ /var/tmp/diff_new_pack.hqPsbf/_new 2014-11-14 09:19:29.000000000 +0100 @@ -17,24 +17,22 @@ Name: python-qscintilla +Version: 2.8.4 +Release: 0 +Summary: Python Bindings for the C++ Editor Class Library +License: GPL-2.0+ +Group: Development/Libraries/C and C++ +Url: http://www.riverbankcomputing.co.uk/qscintilla +Source: http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{version}/QScintilla-gpl-%{version}.tar.gz BuildRequires: libdrm-devel BuildRequires: libqscintilla-devel -BuildRequires: libqscintilla2-11 BuildRequires: python-devel BuildRequires: python-qt4-devel BuildRequires: python-sip-devel -Url: http://www.riverbankcomputing.co.uk/qscintilla -Summary: Python Bindings for the C++ Editor Class Library -License: GPL-2.0+ -Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.8.2 -Release: 0 -%define scintilla_version %version -Source: http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{version}/QScintilla-gpl-%{version}.tar.gz %requires_ge python-qt4 %requires_ge python-sip -%py_requires +%requires_ge libqt4-x11 %description QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class. @@ -44,13 +42,6 @@ This package is mainly used by eric, the Python IDE. - - -Authors: --------- - Riverbank Computing Limited <[email protected]> - - %package sip Summary: sip files for PyQScintilla Group: Development/Libraries/Python @@ -61,32 +52,30 @@ bindings to QScintilla %prep -%setup -q -n QScintilla-gpl-%scintilla_version +%setup -q -n QScintilla-gpl-%{version} %build pushd Python python configure.py -make %{?jobs:-j %jobs} +make %{?_smp_mflags} popd %install pushd Python -%makeinstall INSTALL_ROOT=$RPM_BUILD_ROOT +make DESTDIR=%{buildroot} install %{?_smp_mflags} INSTALL_ROOT=%{buildroot} popd -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc NEWS README LICENSE.GPL2 LICENSE.GPL3 -%py_sitedir/PyQt4/Qsci.so -/usr/share/qt4/api -/usr/share/qt4/api/python -/usr/share/qt4/api/python/QScintilla2.api +%{python_sitearch}/PyQt4/Qsci.so +%{_datadir}/qt4/qsci +%{_datadir}/qt4/qsci/api +%{_datadir}/qt4/qsci/api/python +%{_datadir}/qt4/qsci/api/python/QScintilla2.api %files sip %defattr(-,root,root) -/usr/share/sip/PyQt4/Qsci +%{_datadir}/sip/PyQt4/Qsci %changelog ++++++ python3-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.hqPsbf/_old 2014-11-14 09:19:29.000000000 +0100 +++ /var/tmp/diff_new_pack.hqPsbf/_new 2014-11-14 09:19:29.000000000 +0100 @@ -17,24 +17,20 @@ Name: python3-qscintilla -Url: http://www.riverbankcomputing.co.uk/software/qscintilla/intro +Version: 2.8.4 +Release: 0 Summary: Python 3 Bindings for the C++ Editor Class Library License: GPL-2.0+ Group: Development/Libraries/C and C++ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.8.2 -Release: 0 -%define scintilla_version %version +Url: http://www.riverbankcomputing.co.uk/software/qscintilla/intro Source: http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{version}/QScintilla-gpl-%{version}.tar.gz -Requires: python3-qt4 >= %( echo `rpm -q --queryformat '%{VERSION}' python3-qt4`) - +BuildRequires: libdrm-devel BuildRequires: libqscintilla-devel -BuildRequires: libqscintilla2-11 BuildRequires: python3-devel BuildRequires: python3-qt4-devel BuildRequires: python3-sip-devel - -Requires: python(abi) = %{py3_ver} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%requires_ge python3-qt4 %requires_ge python3-sip %requires_ge libqt4-x11 @@ -47,7 +43,7 @@ This package is mainly used by eric, the Python IDE. %prep -%setup -q -n QScintilla-gpl-%scintilla_version +%setup -q -n QScintilla-gpl-%{version} %build pushd Python @@ -57,20 +53,18 @@ %install pushd Python -%makeinstall INSTALL_ROOT=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT/usr/share/sip/PyQt4/Qsci -mv $RPM_BUILD_ROOT/usr/share/qt4/api/python $RPM_BUILD_ROOT/usr/share/qt4/api/python3 +make DESTDIR=%{buildroot} install %{?_smp_mflags} INSTALL_ROOT=%{buildroot} popd - -%clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot}%{_datadir}/sip/PyQt4/Qsci +mv %{buildroot}%{_datadir}/qt4/qsci/api/python %{buildroot}%{_datadir}/qt4/qsci/api/python3 %files %defattr(-,root,root) %doc NEWS README LICENSE.GPL2 LICENSE.GPL3 %{python3_sitearch}/PyQt4/Qsci.so -/usr/share/qt4/api -/usr/share/qt4/api/python3 -/usr/share/qt4/api/python3/QScintilla2.api +%{_datadir}/qt4/qsci +%{_datadir}/qt4/qsci/api +%{_datadir}/qt4/qsci/api/python3 +%{_datadir}/qt4/qsci/api/python3/QScintilla2.api %changelog ++++++ qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.hqPsbf/_old 2014-11-14 09:19:29.000000000 +0100 +++ /var/tmp/diff_new_pack.hqPsbf/_new 2014-11-14 09:19:29.000000000 +0100 @@ -16,20 +16,20 @@ # +%define sonum 11 +%define debug_package_requires libqscintilla2-%{sonum} = %{version}-%{release} Name: qscintilla -BuildRequires: libdrm-devel -BuildRequires: libqt4-devel -Url: http://www.riverbankcomputing.co.uk/software/qscintilla/intro +Version: 2.8.4 +Release: 0 Summary: C++ Editor Class Library License: GPL-2.0+ Group: Development/Libraries/C and C++ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.8.2 -Release: 0 -%define scintilla_version %version +Url: http://www.riverbankcomputing.co.uk/software/qscintilla/intro Source: http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{version}/QScintilla-gpl-%{version}.tar.gz -Patch: %name.diff -%define debug_package_requires libqscintilla2-11 = %version-%release +Patch0: %{name}.diff +BuildRequires: libdrm-devel +BuildRequires: libqt4-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class. @@ -39,18 +39,12 @@ This package is mainly used by eric, the Python IDE. - - -Authors: --------- - Riverbank Computing Limited <[email protected]> - -%package -n libqscintilla2-11 +%package -n libqscintilla2-%{sonum} Summary: C++ Editor Class Library Group: Development/Libraries/C and C++ Provides: qscintilla = %{version} -%description -n libqscintilla2-11 +%description -n libqscintilla2-%{sonum} QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class. This is a Qt port from the original Scintilla class @@ -58,20 +52,14 @@ This package is mainly used by eric, the Python IDE. - - -Authors: --------- - Riverbank Computing Limited <[email protected]> - %package -n libqscintilla-devel Summary: C++ Editor Class Library Development Files Group: Development/Libraries/C and C++ -Requires: libqscintilla2-11 = %{version} -Requires: libqt4-devel >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-devel`) +Requires: libqscintilla2-%{sonum} = %{version} # openSUSE 10.3 Provides: qscintilla-devel = %{version} Obsoletes: qscintilla-devel < %{version} +%requires_ge libqt4-devel %description -n libqscintilla-devel QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class. @@ -81,54 +69,45 @@ This package is mainly used by eric, the Python IDE. - - -Authors: --------- - Riverbank Computing Limited <[email protected]> - %prep -%setup -q -n QScintilla-gpl-%scintilla_version -%patch +%setup -q -n QScintilla-gpl-%{version} +%patch0 %build pushd Qt4Qt5 qmake -make %{?jobs:-j %jobs} +make %{?_smp_mflags} popd pushd designer-Qt4Qt5 qmake -make %{?jobs:-j %jobs} +make %{?_smp_mflags} popd %install pushd Qt4Qt5 -make INSTALL_ROOT=$RPM_BUILD_ROOT install +make INSTALL_ROOT=%{buildroot} install popd pushd designer-Qt4Qt5 -make INSTALL_ROOT=$RPM_BUILD_ROOT install +make INSTALL_ROOT=%{buildroot} install popd -%post -n libqscintilla2-11 -p /sbin/ldconfig - -%postun -n libqscintilla2-11 -p /sbin/ldconfig +%post -n libqscintilla2-%{sonum} -p /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT +%postun -n libqscintilla2-%{sonum} -p /sbin/ldconfig -%files -n libqscintilla2-11 +%files -n libqscintilla2-%{sonum} %defattr(-,root,root) %doc NEWS README LICENSE.GPL2 LICENSE.GPL3 -/usr/share/qt4/qsci -/usr/share/qt4/translations/qscintilla_*.qm -%_libdir/libqscintilla2.so.11* +%{_datadir}/qt4/qsci +%{_datadir}/qt4/translations/qscintilla_*.qm +%{_libdir}/libqscintilla2.so.%{sonum}* %files -n libqscintilla-devel %defattr(-,root,root) -/usr/include/Qsci -/usr/include/Qsci/* -%_libdir/libqscintilla2.so -%_libdir/qt4/plugins/designer/libqscintillaplugin.so +%{_includedir}/Qsci +%{_includedir}/Qsci/* +%{_libdir}/libqscintilla2.so +%{_libdir}/qt4/plugins/designer/libqscintillaplugin.so %{_datadir}/qt4/mkspecs/features/qscintilla2.prf %changelog ++++++ QScintilla-gpl-2.8.2.tar.gz -> QScintilla-gpl-2.8.4.tar.gz ++++++ ++++ 56820 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
