[rpms/inn] epel10.3: build process clean-up

[rpms/inn] epel10.3: build process clean-up

[Dominik 'Rathann' Mierzejewski]

            A new commit has been pushed.

            Repo   : rpms/inn
            Branch : epel10.3
            Commit : 71d55da33c01ed999040f5bec7dc1880569edd2b
            Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
            Date   : 2017-01-27T02:58:03+01:00
            Stats  : +58/-22 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/inn/c/71d55da33c01ed999040f5bec7dc1880569edd2b?branch=epel10.3

            Log:
            build process clean-up

add missing BR: for perl modules GD and MIME::Parser
perl(GD) is optional at runtime
drop obsolete configure options
drop ancient and obsolete compilation flags
re-enable parallel make builds
fix debuginfo extraction
fix warning: %%defattr doesn't define directory mode...

---
diff --git a/inn.spec b/inn.spec
index 8c55069..ec49a9b 100644
--- a/inn.spec
+++ b/inn.spec
@@ -3,7 +3,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -29,8 +29,13 @@ BuildRequires: python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel perl
 BuildRequires: perl-devel
 BuildRequires: perl-generators
 BuildRequires: perl(ExtUtils::Embed) flex systemd
+BuildRequires: perl(GD)
+BuildRequires: perl(MIME::Parser)
 BuildRequires: cyrus-sasl-devel
 BuildRequires: openssl-devel
+%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))
@@ -101,39 +106,28 @@ This package contains dynamic libraries provided by INN project
 
 %patch17 -p1 -b .pfix
 
-perl -pi -e 's/su news/su -m news/' ./INSTALL
-perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
-perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
-
 %build
-export DEFINE_INN_FLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -DHAVE_ET_COM_ERR_H -DHAVE_SSIZE_T"
-export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
-
-%ifarch s390 s390x sparc sparcv9 sparc64
-export CFLAGS="$CFLAGS -fPIC"
-%else
-export CFLAGS="$CFLAGS -fpic"
-%endif
-
+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-etc-dir=%{_sysconfdir}/news --with-tmp-dir=%{_sharedstatedir}/news/tmp \
+  --with-tmp-dir=%{_sharedstatedir}/news/tmp \
   --with-perl --enable-shared --enable-uucp-rnews \
   --with-libperl-dir=%{perl_vendorlib} \
   --with-openssl \
   --with-sasl \
-  --enable-pgp-verify --with-sendmail=/usr/sbin/sendmail \
+  --with-sendmail=/usr/sbin/sendmail \
   --with-news-user=news --with-news-group=news --with-news-master=news \
-  --enable-ipv6 --with-http-dir=%{_sharedstatedir}/news/http \
-  --enable-libtool --disable-static --with-pic
+  --with-http-dir=%{_sharedstatedir}/news/http \
+  --enable-largefiles \
+  --disable-static --with-pic
 
 # 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
 
-make # %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
@@ -190,6 +184,40 @@ rm -f $RPM_BUILD_ROOT%{_libexecdir}/news/filter/filter_innd.pl
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ln -sf %{_libexecdir}/news/inews $RPM_BUILD_ROOT%{_bindir}/inews
 ln -sf %{_libexecdir}/news/rnews $RPM_BUILD_ROOT%{_bindir}/rnews
+# fix debuginfo extraction, permissions are set in files section, anyway
+chmod u+w $RPM_BUILD_ROOT%{_libdir}/lib{inn{,hist},storage}.so.*
+pushd $RPM_BUILD_ROOT%{_libexecdir}/news
+chmod u+w \
+          actsync \
+          archive \
+          auth/passwd/{auth_krb5,ckpasswd,radius} \
+          auth/resolv/{domain,ident} \
+          batcher \
+          {buff,file,over}chan \
+          buffindexed_d \
+          convdate \
+          ctlinnd \
+          cvtbatch \
+          expire{,over} \
+          fastrm \
+          getlist \
+          {grep,make,prune}history \
+          imapfeed \
+          inews \
+          inn{bind,confval,d,df,feed,xbatch,xmit} \
+          makedbz \
+          ninpaths \
+          nnrpd \
+          nntpget \
+          ovdb_{init,monitor,server,stat} \
+          rnews{,.libexec/{de,en}code} \
+          shlock \
+          shrinkfile \
+          sm \
+          tdx-util \
+          tinyleaf \
+
+popd
 
 # Remove unwanted files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -323,8 +351,6 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %files
-%defattr(0755,news,news,-)
-%{_bindir}/rnews
 %defattr(-,root,root,-)
 # /etc config files plus config
 %{_unitdir}/innd.service
@@ -383,7 +409,8 @@ fi
 %config(noreplace) %{_sysconfdir}/news/innshellvars.local
 %config(noreplace) %{_sysconfdir}/news/innshellvars.tcl.local
 
-%defattr(0755,root,news,-)
+%defattr(0755,root,news,0755)
+%attr(0755,news,news) %{_bindir}/rnews
 %dir %{_libexecdir}/news
 %{_libexecdir}/news/controlbatch
 %attr(4510,root,news) %{_libexecdir}/news/innbind
@@ -566,6 +593,15 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Fri Jan 27 2017 Dominik Mierzejewski <rpm@greysector.net> - 2.6.1-3
+- add missing BR: for perl modules GD and MIME::Parser
+- perl(GD) is optional at runtime
+- drop obsolete configure options
+- drop ancient and obsolete compilation flags
+- re-enable parallel make builds
+- fix debuginfo extraction
+- fix warning: %%defattr doesn't define directory mode...
+
 * Thu Jan 26 2017 Dominik Mierzejewski <rpm@greysector.net> - 2.6.1-2
 - make sure uucp user exists when installing inn (rnews)
 - make sure news user exists when installing inews