Hello community,
here is the log from the commit of package yate for openSUSE:Factory checked in at 2019-05-28 09:43:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yate (Old)
and /work/SRC/openSUSE:Factory/.yate.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yate"
Tue May 28 09:43:05 2019 rev:32 rq:705654 version:6.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yate/yate.changes 2018-07-06 10:49:23.230725362 +0200
+++ /work/SRC/openSUSE:Factory/.yate.new.5148/yate.changes 2019-05-28 09:43:07.937847044 +0200
@@ -1,0 +2,11 @@
+Mon May 20 09:52:34 UTC 2019 - Christophe Giboudeaux
+
+- Explicitly require zlib at build time.
+- Obsolete yate-qt4 for the factory package to avoid file conflicts.
+
+-------------------------------------------------------------------
+Sun Apr 28 15:52:20 UTC 2019 - Christophe Giboudeaux
+
+- Only build the Qt4 GUI up to suse_version 1500.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yate.spec ++++++
--- /var/tmp/diff_new_pack.R8Xxn1/_old 2019-05-28 09:43:08.565846827 +0200
+++ /var/tmp/diff_new_pack.R8Xxn1/_new 2019-05-28 09:43:08.569846825 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yate
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2011, Sascha Peilicke
# Copyright (c) 2011, Pascal Bleser
#
@@ -14,7 +14,7 @@
# 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/
#
@@ -24,7 +24,7 @@
Summary: Yet Another Telephony Engine
License: GPL-2.0-or-later
Group: Productivity/Telephony/Clients
-Url: http://www.yate.null.ro/
+URL: http://www.yate.null.ro/
Source0: http://yate.null.ro/tarballs/yate6/yate-%{version}-1.tar.gz
Patch1: dont-mess-with-cflags.patch
Patch2: add-arm64-support.patch
@@ -33,7 +33,6 @@
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libgsm-devel
-BuildRequires: libqt4-devel
BuildRequires: lksctp-tools-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
@@ -42,6 +41,13 @@
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(spandsp)
BuildRequires: pkgconfig(speex)
+BuildRequires: pkgconfig(zlib)
+%if 0%{?suse_version} <= 1500
+BuildRequires: libqt4-devel
+%else
+# Needed to avoid conflicts caused by providers.conf which is now in the main package
+Obsoletes: yate-qt4 <= %{version}-%{release}
+%endif
%if 0%{?packman_bs}
BuildRequires: libamrnb-devel
%endif
@@ -71,6 +77,7 @@
This package contains all necessary include files and libraries needed
to compile and develop applications that use Yate.
+%if 0%{?suse_version} <= 1500
%package qt4
Summary: Qt4 client package for Yate
License: GPL-2.0-only
@@ -80,6 +87,7 @@
%description qt4
The yate-qt4 package includes the files needed to use Yate as a VoIP client
with a Qt4 graphical interface.
+%endif
%package scripts
Summary: External scripting package for Yate
@@ -113,8 +121,10 @@
%install
%make_install
+%if 0%{?suse_version} <= 1500
%suse_update_desktop_file -i %{name}-qt4 Network Telephony Qt
rm %{buildroot}%{_prefix}/lib/menu/yate-qt4.menu # Unused, causes lots of rpmlint warnings
+%endif
mkdir -p %{buildroot}%{_docdir}/%{name} # We want docs in /usr/share/doc/packages/yate
mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_docdir}/%{name}
@@ -123,18 +133,29 @@
This %{name} package has been built with AMRNB support.
EOF
%endif
+
+%if 0%{?suse_version} > 1500
+# These files are installed unconditionally but belong to the -qt4 package
+rm -fr %{buildroot}%{_datadir}/%{name}/skins
+rm -fr %{buildroot}%{_datadir}/%{name}/help
+rm %{buildroot}%{_sysconfdir}/%{name}/yate-qt4.conf
+%endif
+
%fdupes %{buildroot}/%{_prefix}
%post -n libyate6 -p /sbin/ldconfig
%postun -n libyate6 -p /sbin/ldconfig
+%if 0%{?suse_version} <= 1500
%post qt4 -p /sbin/ldconfig
%postun qt4 -p /sbin/ldconfig
+%endif
%files
-%doc ChangeLog COPYING README
+%license COPYING
+%doc ChangeLog README
%doc %{_docdir}/%{name}/%{name}-%{version}/
%{_bindir}/%{name}
-%{_mandir}/man8/%{name}.8%{ext_man}
+%{_mandir}/man8/%{name}.8%{?ext_man}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/data
%{_datadir}/%{name}/sounds
@@ -234,6 +255,7 @@
%config(noreplace) %{_sysconfdir}/%{name}/pbxassist.conf
%config(noreplace) %{_sysconfdir}/%{name}/pgsqldb.conf
%config(noreplace) %{_sysconfdir}/%{name}/presence.conf
+%config(noreplace) %{_sysconfdir}/%{name}/providers.conf
%config(noreplace) %{_sysconfdir}/%{name}/queues.conf
%config(noreplace) %{_sysconfdir}/%{name}/queuesnotify.conf
%config(noreplace) %{_sysconfdir}/%{name}/radiotest.conf
@@ -278,9 +300,10 @@
%{_includedir}/%{name}
%{_libdir}/lib*.so
%{_bindir}/%{name}-config
-%{_mandir}/man8/%{name}-config.8%{ext_man}
+%{_mandir}/man8/%{name}-config.8%{?ext_man}
%{_libdir}/pkgconfig/%{name}.pc
+%if 0%{?suse_version} <= 1500
%files qt4
%{_bindir}/yate-qt4
%{_libdir}/libyateqt4.so.*
@@ -290,7 +313,7 @@
%{_datadir}/%{name}/skins
%{_datadir}/%{name}/help
%config(noreplace) %{_sysconfdir}/%{name}/yate-qt4.conf
-%config(noreplace) %{_sysconfdir}/%{name}/providers.conf
+%endif
%files scripts
%{_datadir}/%{name}/scripts