Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libyui-qt-pkg for openSUSE:Factory
checked in at 2021-02-26 21:58:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-qt-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt-pkg"
Fri Feb 26 21:58:18 2021 rev:58 rq:872583 version:4.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg-doc.changes
2019-11-11 12:58:06.085544878 +0100
+++
/work/SRC/openSUSE:Factory/.libyui-qt-pkg.new.2378/libyui-qt-pkg-doc.changes
2021-02-26 21:58:21.115762881 +0100
@@ -1,0 +2,7 @@
+Mon Feb 1 14:59:18 UTC 2021 - Stefan Hundhammer <[email protected]>
+
+- New CMake build environment (bsc#1181653)
+- Bumped SO version to 15
+- 4.0.0
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg.changes
2020-12-01 14:21:35.761516038 +0100
+++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new.2378/libyui-qt-pkg.changes
2021-02-26 21:58:21.507763226 +0100
@@ -1,0 +2,13 @@
+Mon Feb 15 15:25:39 UTC 2021 - Stefan Hundhammer <[email protected]>
+
+- Require libyui-qt (bsc#1181653)
+- 4.0.1
+
+-------------------------------------------------------------------
+Mon Feb 1 14:59:17 UTC 2021 - Stefan Hundhammer <[email protected]>
+
+- New CMake build environment (bsc#1181653)
+- Bumped SO version to 15
+- 4.0.0
+
+-------------------------------------------------------------------
Old:
----
libyui-qt-pkg-2.48.5.tar.bz2
New:
----
libyui-qt-pkg-4.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.DbQwb3/_old 2021-02-26 21:58:22.103763749 +0100
+++ /var/tmp/diff_new_pack.DbQwb3/_new 2021-02-26 21:58:22.107763753 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libyui-qt-pkg-doc
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,50 +17,58 @@
%define parent libyui-qt-pkg
-%define so_version 14
+%define so_version 15
+
Name: %{parent}-doc
-Version: 2.48.5
+
+# DO NOT manually bump the version here; instead, use rake version:bump
+Version: 4.0.1
Release: 0
-Summary: Libyui-qt-pkg documentation
-License: LGPL-2.1-only OR LGPL-3.0-only
-URL: https://github.com/libyui/
-Source: %{parent}-%{version}.tar.bz2
-BuildRequires: cmake >= 2.8
+BuildArch: noarch
+
+BuildRequires: cmake >= 3.10
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: graphviz
-BuildRequires: graphviz-gnome
BuildRequires: libyui-devel >= 3.9.0
-BuildRequires: texlive-epstopdf-bin
-BuildRequires: texlive-latex
-BuildArch: noarch
+
+Summary: Libyui-qt-pkg documentation
+License: LGPL-2.1-only OR LGPL-3.0-only
+URL: https://github.com/libyui/
+Source: %{parent}-%{version}.tar.bz2
%description
-This package contains the Qt package selector
-component for libYUI.
+This package contains the Qt package selector component for libyui.
+
+This package provides HTML class documentation.
-This package provides the documentation. (HTML & PDF)
%prep
%setup -q -n %{parent}-%{version}
%build
-export CFLAGS="%{optflags} -DNDEBUG"
-export CXXFLAGS="%{optflags} -DNDEBUG"
-./bootstrap.sh %{_prefix}
+mkdir build
+cd build
+
+cmake .. \
+ -DBUILD_DOC=on \
+ -DBUILD_SRC=off \
+ -DDOC_DESTDIR=$RPM_BUILD_ROOT
-%cmake \
- -DDOC_DIR=%{_docdir} \
- -DDOCS_ONLY=ON
-%cmake_build docs
+# No "make doc" here: This would only duplicate the doxygen call
%install
-%cmake_install
+
+cd build
+make install-doc
+# This implicitly includes "make doc" unconditionally
+
%fdupes -s %{buildroot}/%{_docdir}/%{parent}%{so_version}
%files
+%defattr(-,root,root)
%doc %{_docdir}/%{parent}%{so_version}
%changelog
++++++ libyui-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.DbQwb3/_old 2021-02-26 21:58:22.123763767 +0100
+++ /var/tmp/diff_new_pack.DbQwb3/_new 2021-02-26 21:58:22.127763770 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libyui-qt-pkg
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,44 +16,53 @@
#
-%define so_version 14
-%define bin_name %{name}%{so_version}
-%define libyui_qt_devel_version libyui-qt-devel >= 2.50.1
-%define libzypp_devel_version libzypp-devel >= 17.21.0
Name: libyui-qt-pkg
-Version: 2.48.5
+
+# DO NOT manually bump the version here; instead, use rake version:bump
+Version: 4.0.1
Release: 0
+
+%define so_version 15
+%define libyui_devel_version libyui-devel >= 3.10.0
+%define libyui_qt_devel_version libyui-qt-devel >= 2.50.1
+%define libzypp_devel_version libzypp-devel >= 17.21.0
+%define bin_name %{name}%{so_version}
+
+BuildRequires: boost-devel
+BuildRequires: cmake >= 3.10
+BuildRequires: gcc-c++
+BuildRequires: pkg-config
+
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5X11Extras)
+
+BuildRequires: %{libyui_devel_version}
+BuildRequires: %{libyui_qt_devel_version}
+BuildRequires: %{libzypp_devel_version}
+
Summary: Libyui - Qt Package Selector
License: LGPL-2.1-only OR LGPL-3.0-only
URL: https://github.com/libyui/
Source: %{name}-%{version}.tar.bz2
-BuildRequires: %{libyui_qt_devel_version}
-BuildRequires: %{libzypp_devel_version}
-BuildRequires: cmake >= 2.8
-BuildRequires: gcc-c++
-BuildRequires: libqt5-qtbase-devel
-BuildRequires: libqt5-qtsvg-devel
-BuildRequires: libqt5-qtx11extras-devel
-BuildRequires: libyui-devel >= 3.9.0
-BuildRequires: pkgconfig
-%if 0%{?suse_version} > 1325
-BuildRequires: libboost_headers-devel
-%else
-BuildRequires: boost-devel
-%endif
%description
-This package contains the Qt package selector
-component for libYUI.
+This package contains the Qt package selector component for libyui.
+
%package -n %{bin_name}
-Summary: Libyui - Qt Package Selector
+Summary: Libyui - Qt package selector
+
# bsc#1114654: Need Qt SVG support for icons (built-in and from theme)
Requires: libQt5Svg5
# Selectable::hasRetracted()
Requires: libzypp >= 17.21.0
# YPackageSelector#onlineSearchEnabled()
Requires: libyui%{so_version} >= 3.9.2
+Requires: libyui-qt%{so_version}
Supplements: (libyui-qt and yast2-packager)
Conflicts: libqdialogsolver1 < 1.4.0
Provides: %{name} = %{version}
@@ -67,52 +76,67 @@
Obsoletes: libqdialogsolver1 < 1.4.0
%description -n %{bin_name}
-This package contains the Qt package selector
-component for libYUI.
+This package contains the Qt package selector component for libyui.
+
%package devel
Summary: Libyui-qt-pkg header files
+
Requires: %{bin_name} = %{version}
Requires: %{libyui_qt_devel_version}
Requires: %{libzypp_devel_version}
%description devel
-This package contains the Qt package selector
-component for libYUI.
+This package contains the Qt package selector component for libyui.
This can be used independently of YaST for generic (C++) applications.
This package has very few dependencies.
+
%prep
%setup -q
%build
-export CFLAGS="%{optflags} -DNDEBUG"
-export CXXFLAGS="%{optflags} -DNDEBUG"
-./bootstrap.sh %{_prefix}
+export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+
+mkdir build
+cd build
-%cmake \
- -DYPREFIX=%{_prefix} \
+%if %{?_with_debug:1}%{!?_with_debug:0}
+CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELWITHDEBINFO"
+%else
+CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELEASE"
+%endif
+
+cmake .. \
-DDOC_DIR=%{_docdir} \
- -DLIB_DIR=%{_lib}
-%cmake_build
+ -DLIB_DIR=%{_lib} \
+ $CMAKE_OPTS
+
+make %{?jobs:-j%jobs}
%install
-%cmake_install
+cd build
+make install DESTDIR="$RPM_BUILD_ROOT"
+install -m0755 -d $RPM_BUILD_ROOT/%{_libdir}/yui
+install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/
+install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/
%post -n %{bin_name} -p /sbin/ldconfig
%postun -n %{bin_name} -p /sbin/ldconfig
%files -n %{bin_name}
-%license COPYING*
+%defattr(-,root,root)
%dir %{_libdir}/yui
%{_libdir}/yui/lib*.so.*
+%doc %dir %{_docdir}/%{bin_name}
+%license %{_docdir}/%{bin_name}/COPYING*
%files devel
+%defattr(-,root,root)
%{_libdir}/yui/lib*.so
-%{_includedir}/yui
-%{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/cmake/%{name}
+%{_includedir}/yui/qt-pkg
%changelog
++++++ libyui-qt-pkg-2.48.5.tar.bz2 -> libyui-qt-pkg-4.0.1.tar.bz2 ++++++
++++ 4005 lines of diff (skipped)
