Accepting request 509766 from home:olh:branches:server:mail

- Add buildconditional for openssl/gnutls
  Disable gnutls, there can be only one of them and openssl was used
- Use pkgconfig to refer to openssl/gnutls
- Remove uneeded builddeps and recommends for smtp_daemon by
  specifying the path to sendmail
- Remove uneeded builddep for ispell by specifying the path to it
- Update doc builddeps: add opensp, libxslt-tools, w3m
  drop docbook_4,libxml2,libxslt,lynx,sgml-skel,xli
- Remove unneeded builddeps: fdupes,glibc-i18ndata,libassuan,
  libcom_err,libgcrypt,libgpg-error
- Wrap desktop files handing in suse_version
- Remove included krb5-config, the copy in the devel pkg is good enough
- Use configure macro for ordinary autoconf result
- Build manual.txt with w3m to properly dump tables
- Move Requires perl-Expect to doc pkg, make it a Recommends
- Consistent suse_version for shared-mime-info usage
- Unconditional libgpgme usage
- Unconditional autoreconf

OBS-URL: https://build.opensuse.org/request/show/509766
OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=170

krb5-config

@@ -1,3 +0,0 @@
-#!/bin/bash
-unset CFLAGS
-/usr/lib/mit/bin/krb5-config ${1+"$@"} | sed -e 's/-Wl[^[:blank:]]+//g'

mutt.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Wed Jul 12 09:26:50 UTC 2017 - olaf@aepfle.de
+
+- Add buildconditional for openssl/gnutls
+  Disable gnutls, there can be only one of them and openssl was used
+- Use pkgconfig to refer to openssl/gnutls
+- Remove uneeded builddeps and recommends for smtp_daemon by
+  specifying the path to sendmail
+- Remove uneeded builddep for ispell by specifying the path to it
+- Update doc builddeps: add opensp, libxslt-tools, w3m
+  drop docbook_4,libxml2,libxslt,lynx,sgml-skel,xli
+- Remove unneeded builddeps: fdupes,glibc-i18ndata,libassuan,
+  libcom_err,libgcrypt,libgpg-error
+- Wrap desktop files handing in suse_version
+- Remove included krb5-config, the copy in the devel pkg is good enough
+- Use configure macro for ordinary autoconf result
+- Build manual.txt with w3m to properly dump tables
+- Move Requires perl-Expect to doc pkg, make it a Recommends
+- Consistent suse_version for shared-mime-info usage
+- Unconditional libgpgme usage
+- Unconditional autoreconf
+
 -------------------------------------------------------------------
 Tue Jun 13 08:21:30 UTC 2017 - werner@suse.de
 

mutt.spec

@@ -16,55 +16,43 @@
 #
 
 
+%bcond_without mutt_openssl
+%bcond_with    mutt_gnutls
+
 Name:           mutt
-#!BuildIgnore:  sendmail
+%if %{with mutt_openssl}
+BuildRequires:  pkgconfig(openssl)
+%endif
+%if %{with mutt_gnutls}
+BuildRequires:  pkgconfig(gnutls)
+%endif
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  cyrus-sasl-gssapi
-BuildRequires:  docbook-xsl-stylesheets
-BuildRequires:  docbook_4
-BuildRequires:  fdupes
 BuildRequires:  gdbm-devel
-BuildRequires:  glibc-i18ndata
-BuildRequires:  ispell
 BuildRequires:  krb5-devel
-BuildRequires:  libcom_err
-%if 0%{?suse_version} <= 1230
-BuildRequires:  libgcrypt
-%else
-BuildRequires:  libgcrypt-devel
-%endif
-BuildRequires:  libgnutls-devel
-BuildRequires:  libgpg-error-devel
 BuildRequires:  libidn-devel
 BuildRequires:  libkyotocabinet-devel
-BuildRequires:  libopenssl-devel
-BuildRequires:  libxml2
-BuildRequires:  libxslt
 BuildRequires:  lua-devel
-BuildRequires:  lynx
 BuildRequires:  ncurses-devel
 %if 0%{?is_opensuse}
 BuildRequires:  notmuch-devel
 %endif
-BuildRequires:  postfix
+BuildRequires:  docbook-xsl-stylesheets
-BuildRequires:  sgml-skel
+BuildRequires:  libxslt-tools
+BuildRequires:  opensp
+%if 0%{?suse_version}
 BuildRequires:  update-desktop-files
-BuildRequires:  xli
-#if
-%if 0%{?suse_version} > 1130
-BuildRequires:  libassuan-devel
-BuildRequires:  libgpgme-devel
-%else
-BuildRequires:  gpgme-devel
 %endif
+BuildRequires:  w3m
+#if
+BuildRequires:  libgpgme-devel
 Url:            http://www.mutt.org
 Provides:       muttssl
 Obsoletes:      muttssl
 Recommends:     mutt-doc
 Recommends:     mutt-lang
-Recommends:     smtp_daemon
 Recommends:     urlscan
 Recommends:     urlview
 Recommends:     w3m
@@ -72,10 +60,6 @@ Recommends:     w3m
 Requires(post):   shared-mime-info
 Requires(postun): shared-mime-info
 %endif
-Requires:       perl(Expect)
-# NOTE: We don't want this dependency and desktop-data-SuSE is in all
-# desktop selections.
-#Requires:      desktop-data-SuSE
 %global	neo     20170609
 Version:        1.8.3
 Release:        0
@@ -93,7 +77,6 @@ Source2:        README.alternates
 Source3:        mutt.png
 Source4:        mutt.desktop
 Source5:        skel.muttrc
-Source6:        krb5-config
 Source9:        mutt.mailcap
 Patch:          %name-%version.dif
 # http://www.spinnaker.de/mutt/compressed/
@@ -125,6 +108,7 @@ however.
 Summary:        Additional Documentation about Mutt
 Group:          Documentation/Other
 Requires:       %{name} = %{version}
+Recommends:     perl(Expect)
 Provides:       %{name}:%{_docdir}/%name/COPYRIGHT
 BuildArch:      noarch
 
@@ -163,9 +147,7 @@ rm -vf PATCHES*.orig
 cp %{S:2} .
 
 %build
-%if 0%{?suse_version} > 1100
 autoreconf -fi
-%endif
   cflags ()
   {
     local flag=$1; shift
@@ -201,21 +183,28 @@ cflags -Wl,--as-needed			LDFLAGS
 cflags -Wl,-O2				LDFLAGS
 cflags -Wl,--hash-size=8599		LDFLAGS
 cflags -pie				LDFLAGS
-KRB5CFGPATH=%{S:6}
+export CC CFLAGS LDFLAGS
-export CC CFLAGS LDFLAGS KRB5CFGPATH
+export SENDMAIL=/usr/sbin/sendmail
-chmod 755 $KRB5CFGPATH
+export ISPELL=/usr/bin/ispell
-./configure $RPM_ARCH-suse-linux \
+export PATH="/usr/lib/mit/bin:$PATH"
-	--prefix=%{_prefix} \
+export KRB5CFGPATH="$(type -p krb5-config)"
-	--datadir=%{_datadir} \
+$KRB5CFGPATH --cflags gssapi
-	--sysconfdir=%{_sysconfdir} \
+$KRB5CFGPATH --libs gssapi
-	--mandir=%{_mandir} \
+$KRB5CFGPATH --version
+%configure \
 	--with-docdir=%{_docdir}/%name \
+	--without-ssl \
+	--without-gnutls \
+%if %{with mutt_openssl}
+	--with-ssl=%{_prefix} \
+%endif
+%if %{with mutt_gnutls}
+	--with-gnutls=%{_prefix} \
+%endif
 	--enable-imap \
 	--enable-pop \
 	--enable-pgp \
-%if 0%{?suse_version} >= 1100
 	--enable-gpgme \
-%endif
 	--enable-nfs-fix \
 	--enable-mailtool \
 	--enable-compressed \
@@ -226,10 +215,8 @@ chmod 755 $KRB5CFGPATH
 	--disable-external-dotlock \
 	--with-gdbm \
 	--with-kyotocabinet \
-	--with-ssl=%{_prefix} \
 	--with-sasl=%{_prefix} \
 	--with-gss=%{_prefix} \
-	--with-gnutls=%{_prefix} \
 	--with-curses=%{_prefix} \
 	--enable-smtp \
 	--enable-lua \
@@ -270,10 +257,11 @@ install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%name/mailcap
 rm -vf %{buildroot}%{_docdir}/%name/manual.txt
 install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%name/
 chmod a-x %{buildroot}%{_docdir}/%name/keybase/*.sh
+%if 0%{?suse_version}
 %suse_update_desktop_file mutt
+%endif
 
-%if 0%{?suse_version} >= 1140
+%if 0%{?suse_version} > 1130
-
 %post
 %mime_database_post