Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package mpop for openSUSE:Factory checked in 
at 2021-11-27 00:51:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mpop (Old)
 and      /work/SRC/openSUSE:Factory/.mpop.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mpop"

Sat Nov 27 00:51:02 2021 rev:2 rq:933931 version:1.4.14

Changes:
--------
--- /work/SRC/openSUSE:Factory/mpop/mpop.changes        2021-11-09 
23:54:26.255947338 +0100
+++ /work/SRC/openSUSE:Factory/.mpop.new.1895/mpop.changes      2021-11-27 
00:51:44.562715402 +0100
@@ -1,0 +2,6 @@
+Thu Nov 25 20:59:30 UTC 2021 - Fabrice BAUZAC-STEHLY <[email protected]>
+
+- Add support for SLE-12:
+  * When building for SLE-12, switch to openssl instead of gnutls.
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ mpop.spec ++++++
--- /var/tmp/diff_new_pack.7JzrgX/_old  2021-11-27 00:51:45.318712792 +0100
+++ /var/tmp/diff_new_pack.7JzrgX/_new  2021-11-27 00:51:45.322712778 +0100
@@ -1,34 +1,80 @@
 #
-# spec file for package mpop.
+# spec file for package mpop
 #
+# Copyright (c) 2021 SUSE LLC
 # Copyright (c) 2021 Fabrice Bauzac.
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-# norootforbuild
+
 %bcond_with gnome-keyring
 
 Name:           mpop
 Version:        1.4.14
-Release:        1
+Release:        0
 
+# On SLE-12, this should be GPL-3.0+; if we indicate
+# "GPL-3.0-or-later", rpmlint issues this warning:
+#
+#   invalid-license GPL-3.0-or-later
+#
+# However, I'm on a Tumbleweed 2021-11, and whenever I write
+# "GPL-3.0+", something (what?) overwrites my .spec to replace the
+# license with "GPL-3.0-or-later", and I don't know how to disable
+# this annoying replacement.
+#
+# For now, I'm keeping "GPL-3.0-or-later", and I'll ignore the rpmlint
+# warning....
 License:        GPL-3.0-or-later
+
 Group:          Productivity/Networking/Email/Utilities
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libidn-devel
-BuildRequires:  pkgconfig
+
+# For an unknown reason, rpmlint says:
+#
+#   invalid-suse-version-check 1315
+#
+# However, this suse_version value is actually documented in
+# https://en.opensuse.org/openSUSE:Packaging_for_Leap.  Which is
+# correct, rpmlint or the documentation?
+%if %suse_version > 1315
 BuildRequires:  libgnutls-devel
-BuildRequires:  libsecret-devel
+%else
+# mpop recommends gnutls over openssl:
+#
+#   configure: WARNING: Using OpenSSL is discouraged; consider using GnuTLS 
instead
+#
+# However, it requires gnutls >= 3.4 while SLE-12 only has 3.2.15.
+#
+# I see two solutions in the case of SLE-12:
+# - switch to openssl
+# - try using SLE-12-SP5 which might have a newer version of gnutls
+#
+# Let's opt for the first solution: openssl.
+BuildRequires:  libopenssl-devel
+%endif
+
 BuildRequires:  libgsasl-devel
+BuildRequires:  libidn-devel
+BuildRequires:  libsecret-devel
+BuildRequires:  pkgconfig
 %if %{with gnome-keyring}
 BuildRequires:  pkgconfig(gnome-keyring-1)
 %endif
-Url:            https://marlam.de/mpop/
+URL:            https://marlam.de/mpop/
 Source:         https://marlam.de/mpop/releases/mpop-1.4.14.tar.xz
 
 Summary:        Lightweight and featureful POP3 Client
@@ -58,8 +104,15 @@
 %if 0%{?suse_version} > 1000
 export CFLAGS="%{optflags} -fstack-protector"
 %endif
-%configure --with-tls=gnutls --with-libgsasl --docdir="%{_docdir}/%{name}"
-%make_build
+
+%if %suse_version > 1315
+tls_lib=gnutls
+%else
+tls_lib=openssl
+%endif
+
+%configure --with-tls=$tls_lib --with-libgsasl --docdir="%{_docdir}/%{name}"
+make -O %{?_smp_mflags} V=1 VERBOSE=1
 
 %install
 %makeinstall V=1

Reply via email to