Hello community, here is the log from the commit of package qwt for openSUSE:Factory checked in at 2019-06-19 20:55:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qwt (Old) and /work/SRC/openSUSE:Factory/.qwt.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qwt" Wed Jun 19 20:55:28 2019 rev:15 rq:698687 version:5.2.3_qt5+git20181129.2819734 Changes: -------- --- /work/SRC/openSUSE:Factory/qwt/qwt.changes 2014-03-18 16:01:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qwt.new.4811/qwt.changes 2019-06-19 20:55:34.105835358 +0200 @@ -1,0 +2,7 @@ +Wed Apr 17 16:21:13 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Use a Qt5 snapshot for qwt, needed by scidavis 1.25. +- Run spec-cleaner +- Drop the examples package. qwt5 has only one user. + +------------------------------------------------------------------- Old: ---- qwt-5.2.3.pdf qwt-5.2.3.tar.bz2 qwt-rpmlintrc New: ---- _service _servicedata qwt-5.2.3_qt5+git20181129.2819734.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qwt.spec ++++++ --- /var/tmp/diff_new_pack.WgtqLA/_old 2019-06-19 20:55:36.773837685 +0200 +++ /var/tmp/diff_new_pack.WgtqLA/_new 2019-06-19 20:55:36.817837723 +0200 @@ -1,7 +1,7 @@ # # spec file for package qwt # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,27 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define lname libqwt5-qt5-5 Name: qwt -%define lname libqwt5 +Version: 5.2.3_qt5+git20181129.2819734 +Release: 0 Summary: Qt Widgets for Technical Applications License: SUSE-QWT-1.0 Group: Development/Libraries/C and C++ -Version: 5.2.3 -Release: 0 -Url: http://qwt.sourceforge.net/ -Source: http://switch.dl.sourceforge.net/sourceforge/qwt/qwt-%{version}.tar.bz2 -Source2: qwt-rpmlintrc -Source3: %{name}-%{version}.pdf -BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: http://qwt.sourceforge.net/ +Source: qwt-%{version}.tar.xz BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ -BuildRequires: libpng-devel -BuildRequires: libqt4-devel +BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) %description The Qwt library contains GUI Components and utility classes which are @@ -56,9 +55,7 @@ Requires: freetype2-devel Requires: gcc-c++ Requires: libpng-devel -Requires: libqt4-devel Recommends: %{name}-devel-doc -Recommends: %{name}-examples Obsoletes: libqwt5-devel < %{version} Provides: libqwt5-devel = %{version} Provides: qwt = %{version} @@ -67,21 +64,10 @@ This package contains the header files of Qwt and its Qt designer plugin in order to create Qt applications using the Qwt widgets. -%package examples -Summary: Example programs using Qwt -Group: Development/Libraries/C and C++ -Requires: %{name}-devel = %{version} -Obsoletes: libqwt5-examples < %{version} -Provides: libqwt5-examples = %{version} - -%description examples -This package contains example programs demonstrating the Qwt widgets. - %package designer Summary: Plugin for the Qt Interface designer Group: Development/Tools/IDE Requires: %{name}-devel = %{version} -Requires: libqt4-devel %description designer The %{name}-designer package contains the plugin for the Qt User Interface @@ -91,71 +77,53 @@ Summary: Development documentation for Qwt Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} -Obsoletes: libqwt5-devel-doc < %{version} -Provides: libqwt5-devel-doc = %{version} # Both provide deprecated(3) man page Conflicts: libftdi1-devel +Provides: libqwt5-devel-doc = %{version} +Obsoletes: libqwt5-devel-doc < %{version} %description devel-doc This package contains the development documentation of the Qwt widgets as is it created by doxygen. %prep -%setup -q +%setup -q -n qwt-%{version} + +# qmake is so fun... +sed -i 's|headers.path = \$\$\[QT_INSTALL_HEADERS\]/qwt5-qt5|headers.path = %{_libqt5_includedir}/qwt5|' qwtconfig.pri +sed -i 's|doc.path = \$\$\[QT_INSTALL_DOCS\]|doc.path = %{_libqt5_docdir}/qwt5|' qwtconfig.pri +sed -i 's|html.path = \$\$\[QT_INSTALL_DOCS\]/html/qwt5-qt\$\$QT_MAJOR_VERSION|html.path = %{_libqt5_docdir}/qwt5/html|' src/src.pro %build -# Now build the qwt5 library -qmake \ +%qmake5 \ INSTALLBASE=%{_prefix} \ - CONFIG+=QwtExamples CONFIG+=QwtSVGItem -after \ - QMAKE_CXXFLAGS="%{optflags}" \ - target.path=%{_libdir} \ - headers.path=%{_includedir}/%{name}5 \ - doc.path=%{_docdir}/%{name}-devel-doc + CONFIG-=QwtExamples make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install INSTALL_ROOT=%{buildroot} -# man -mkdir -p %{buildroot}/%{_mandir} -mv -v %{buildroot}/%{_docdir}/%{name}-devel-doc/man/man3 %{buildroot}/%{_mandir}/ -# docu -install -m0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}-devel-doc/%{name}.pdf -# designer plugin -mkdir -p %{buildroot}/%{_libdir}/qt4/plugins/designer -mv -v %{buildroot}/%{_libdir}/libqwt_designer_plugin.so %{buildroot}/%{_libdir}/qt4/plugins/designer/ +%qmake5_install + %fdupes -s %{buildroot} %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files -n %{lname} -%defattr(-,root,root) -%doc CHANGES COPYING README -%{_libdir}/libqwt*.so.* +%license COPYING +%doc CHANGES README +%{_libqt5_libdir}/libqwt5-qt5.so.* %files designer -%defattr(-,root,root) -%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so +%{_libqt5_plugindir}/designer/*.so %files devel -%defattr(-,root,root) -%{_libdir}/libqwt*.so -%dir %{_includedir}/%{name}5 -%{_includedir}/%{name}5/*.h - -%files examples -%defattr(-,root,root) -%doc examples +%{_libqt5_includedir}/qwt5/ +%{_libqt5_libdir}/libqwt5-qt5.so +%{_libqt5_libdir}/pkgconfig/qwt5-qt5.pc +%{_mandir}/man?/*.?%{ext_info} %files devel-doc -%defattr(-,root,root) -%doc %{_docdir}/%{name}-devel-doc -%{_mandir}/man3/* +%doc %{_libqt5_docdir}/qwt5 %changelog ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="changesgenerate">enable</param> <param name="versionformat">5.2.3_qt5+git%cd.%h</param> <param name="url">https://github.com/gbm19/qwt5-qt5.git</param> <param name="scm">git</param> <param name="filename">qwt</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/gbm19/qwt5-qt5.git</param> <param name="changesrevision">2819734e280ab2fce39338ccecf21124eb787004</param></service></servicedata>
