[rpms/inn] epel10: Merge branch 'f31' into f32

[rpms/inn] epel10: Merge branch 'f31' into f32

[Dominik 'Rathann' Mierzejewski]

A new commit has been pushed.

Repo   : rpms/inn
Branch : epel10
Commit : fcc4a61e7603fc3fd285545f584be338e2df2903
Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date   : 2020-06-21T13:02:46+02:00
Stats  : +54/-25 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/inn/c/fcc4a61e7603fc3fd285545f584be338e2df2903?branch=epel10

Log:
Merge branch 'f31' into f32

---
diff --git a/inn.spec b/inn.spec
index 5a8b788..c2485d2 100644
--- a/inn.spec
+++ b/inn.spec
@@ -3,10 +3,10 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.6.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
-URL: http://www.eyrie.org/~eagle/software/inn/
+URL: https://www.eyrie.org/~eagle/software/inn/
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
 Source1: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz.asc
 Source2: inn-default-distributions
@@ -27,27 +27,40 @@ Patch6: inn-2.5.2.posix.patch
 Patch7: inn-2.4.3.warn.patch
 Patch14: inn-redhat_build.patch
 patch17: inn-2.5.2-pconf.patch
-BuildRequires:  gcc
 BuildRequires: autoconf
-BuildRequires: python2 db4-devel byacc krb5-devel pam-devel e2fsprogs-devel perl-interpreter
-BuildRequires: %{_bindir}/gpgv2
+BuildRequires: byacc
+BuildRequires: cyrus-sasl-devel
+BuildRequires: db4-devel
+BuildRequires: e2fsprogs-devel
+BuildRequires: flex
+BuildRequires: gcc
+BuildRequires: krb5-devel
+BuildRequires: openssl-devel
+BuildRequires: pam-devel
 BuildRequires: perl-devel
 BuildRequires: perl-generators
-BuildRequires: perl(ExtUtils::Embed) flex systemd
+BuildRequires: perl-interpreter
+BuildRequires: perl(ExtUtils::Embed)
 BuildRequires: perl(GD)
 BuildRequires: perl(MIME::Parser)
-BuildRequires: cyrus-sasl-devel
-BuildRequires: openssl-devel
+BuildRequires: python2
+BuildRequires: systemd
+BuildRequires: wget
+BuildRequires: %{_bindir}/gpgv2
 %if 0%{?fedora}
 Recommends: perl(GD)
 %endif
 Requires(pre): shadow-utils
-Requires: grep, coreutils, sed
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: bash >= 2.0
-Requires(post): systemd inews
-Requires(preun): systemd
+Requires: coreutils
+Requires: grep
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: sed
+Requires: wget
+Requires(post): inews
+Requires(post): systemd
 Requires(postun): systemd
+Requires(preun): systemd
 
 # XXX white out bogus perl requirement for now
 Provides: perl(::usr/lib/innshellvars.pl) = %{version}-%{release}
@@ -109,26 +122,35 @@ gpgv2 --keyring %{S:3} %{S:1} %{S:0}
 %patch17 -p1 -b .pfix
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-%configure --bindir=%{_libexecdir}/news \
-  --sysconfdir=%{_sysconfdir}/news --exec-prefix=%{_libexecdir}/news \
-  --with-log-dir=/var/log/news --with-spool-dir=/var/spool/news\
-  --with-db-dir=%{_sharedstatedir}/news --with-run-dir=/run/news \
-  --with-tmp-dir=%{_sharedstatedir}/news/tmp \
-  --with-perl --enable-shared --enable-uucp-rnews \
+%configure \
+  --disable-static \
+  --enable-largefiles \
+  --enable-shared \
+  --enable-uucp-rnews \
+  --bindir=%{_libexecdir}/news \
+  --exec-prefix=%{_libexecdir}/news \
+  --sysconfdir=%{_sysconfdir}/news \
+  --with-db-dir=%{_sharedstatedir}/news \
+  --with-http-dir=%{_sharedstatedir}/news/http \
   --with-libperl-dir=%{perl_vendorlib} \
+  --with-log-dir=/var/log/news \
   --with-openssl \
+  --with-perl \
+  --with-pic \
+  --with-run-dir=/run/news \
   --with-sasl \
   --with-sendmail=/usr/sbin/sendmail \
-  --with-news-user=news --with-news-group=news --with-news-master=news \
-  --with-http-dir=%{_sharedstatedir}/news/http \
-  --enable-largefiles \
-  --disable-static --with-pic
+  --with-spool-dir=/var/spool/news \
+  --with-tmp-dir=%{_sharedstatedir}/news/tmp \
+  --with-news-group=news \
+  --with-news-master=news \
+  --with-news-user=news \
 
 # Don't hardcode rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1558586
 make #%{?_smp_mflags}
 
 %install
@@ -589,6 +611,10 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Fri Jan 31 2020 Dominik Mierzejewski <rpm@greysector.net> - 2.6.3-5
+- add missing dependency on wget
+- use HTTPS in URL
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

diff --git a/inn.spec b/inn.spec
index d484bc0..c2485d2 100644
--- a/inn.spec
+++ b/inn.spec
@@ -3,7 +3,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.6.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 URL: https://www.eyrie.org/~eagle/software/inn/
@@ -611,10 +611,13 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
-* Fri Jan 31 2020 Dominik Mierzejewski <rpm@greysector.net> - 2.6.3-4
+* Fri Jan 31 2020 Dominik Mierzejewski <rpm@greysector.net> - 2.6.3-5
 - add missing dependency on wget
 - use HTTPS in URL
 
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild