- updated,fixed configure options

[packages/inn.git] / inn.spec

diff --git a/inn.spec b/inn.spec
index ba751a11b1f447202d08a75b07e043f4ca2ea8ab..7e044d95a06d05edd24e683b1d81abe2e87bfa6b 100644 (file)
--- a/inn.spec
+++ b/inn.spec
@@ -8,7 +8,7 @@ Summary(pt_BR): INN, InterNet News System (servidor news)
 Summary(tr):   INN, InterNet Haber Sistemi (haber sunucu)
 Name:          inn
 Version:       2.4.1
-Release:       0.5
+Release:       0.9
 License:       distributable
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/inn/%{name}-%{version}.tar.gz
@@ -16,15 +16,12 @@ Source0:    ftp://ftp.isc.org/isc/inn/%{name}-%{version}.tar.gz
 Source1:       %{name}-default-active
 Source2:       %{name}-default-distributions
 Source3:       %{name}-default-newsgroups
-Source4:       %{name}-etc-%{name}.conf
-Source5:       %{name}-etc-newsfeeds
-Source6:       %{name}.crontab
-Source7:       %{name}.init
-Source8:       %{name}-cnfsstat.cron
-Source9:       %{name}.logrotate
-Source10:      %{name}-etc-readers.conf
-Source11:      getlist.1.pl
-Source12:      %{name}d.8.pl
+Source4:       %{name}.crontab
+Source5:       %{name}.init
+Source6:       %{name}-cnfsstat.cron
+Source7:       %{name}.logrotate
+Source8:       getlist.1.pl
+Source9:       %{name}d.8.pl
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-install.patch
 Patch2:                %{name}-db.patch
@@ -36,10 +33,8 @@ Patch7:              %{name}-timecaf_oversized_art.patch
 Patch8:                %{name}-lib_install_modes.patch
 Patch9:                %{name}-kill_warnings.patch
 Patch10:       %{name}-64bit_pointers.patch
-#Patch11:      %{name}-setreuid.patch
-#Patch12:      %{name}-sec.patch
-#Patch13:      %{name}-frsize.patch
-URL:           http://www.isc.org/inn.html
+Patch11:       %{name}-config.patch
+URL:           http://www.isc.org/sw/inn/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
@@ -53,7 +48,7 @@ PreReq:               rc-scripts
 Requires(post):        /bin/kill
 Requires(post):        /usr/bin/getent
 Requires(post,preun):  /sbin/chkconfig
-Requires(post):        sed
+Requires(post):        sed >= 4.0
 Requires(post):        fileutils
 Requires(post):        textutils
 Requires(post):        /usr/sbin/usermod
@@ -257,9 +252,7 @@ sunucuya makaleyi yollar.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-#%patch11 -p1  -- obsolete? (no setreuid test)
-#%patch12 -p1  -- obsolete? (pathrun not used in inndstart)
-#%patch13 -p1  -- obsolete? (?)
+%patch11 -p1
 
 touch innfeed/*.[ly]
 
@@ -272,15 +265,17 @@ touch innfeed/*.[ly]
        --with-news-user=news \
        --with-news-group=news \
        --with-news-master=news \
+       --with-control-dir=%{_datadir}/news/control \
        --with-db-dir=/var/lib/news \
        --with-etc-dir=%{_sysconfdir} \
+       --with-filter-dir=%{_datadir}/news/filter \
        --with-log-dir=/var/log/news \
        --with-run-dir=/var/run/news \
        --with-spool-dir=/var/spool/news \
        --with-lib-dir=%{_datadir}/news \
-       --with-tmp-path=/var/spool/news/incoming/tmp \
+       --with-tmp-dir=/var/spool/news/incoming/tmp \
        --with-perl \
-       --with-sendmail=%{_libdir}/sendmail \
+       --with-sendmail=/usr/lib/sendmail \
        --with-openssl=%{_prefix} \
        --with-berkeleydb=%{_prefix} \
        %{?_with_largefiles:--enable-largefiles} \
@@ -320,15 +315,12 @@ install samples/readers.conf $RPM_BUILD_ROOT%{_sysconfdir}/readers.conf
 install %{SOURCE1} $RPM_BUILD_ROOT/var/lib/news/active
 install %{SOURCE2} $RPM_BUILD_ROOT/var/lib/news/distributions
 install %{SOURCE3} $RPM_BUILD_ROOT/var/lib/news/newsgroups
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/inn.conf
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/newsfeeds
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/inn
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/inn
-install %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}/cnfsstat.cron
-install %{SOURCE9} $RPM_BUILD_ROOT/etc/logrotate.d/inn
-install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/readers.conf
-install %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/pl/man1/getlist.1
-install %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/pl/man8/innd.8
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/inn
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/inn
+install %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/cnfsstat.cron
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/logrotate.d/inn
+install %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/pl/man1/getlist.1
+install %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/pl/man8/innd.8
 
 rm -f $RPM_BUILD_ROOT/var/lib/news/history
 
@@ -371,7 +363,6 @@ if [ -f /var/lib/news/history ]; then
        chmod 644 history.*
 else
        cd /var/lib/news
-       cp /dev/null history
        %{_bindir}/makehistory
        %{_bindir}/makedbz -s `wc -l <history` -f history
        for i in dir hash index pag; do
@@ -412,8 +403,7 @@ fi
 umask 027
 if [ -f /etc/syslog.conf ]; then
   if ! grep -q INN /etc/syslog.conf; then
-    sed 's/mail.none;/mail.none;news.none;/' < /etc/syslog.conf > /etc/syslog.conf.inn
-    mv -f /etc/syslog.conf.inn /etc/syslog.conf
+    sed -i 's/mail.none;/mail.none;news.none;/' /etc/syslog.conf
     echo ''                                                                            >> /etc/syslog.conf
     echo '#'                                                                           >> /etc/syslog.conf
     echo '# INN'                                                                       >> /etc/syslog.conf
@@ -541,6 +531,8 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/news/filter/INN.py
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/news/filter/filter_nnrpd.pl
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/news/filter/filter.tcl
+%config(noreplace) %verify(not size mtime md5) %{_datadir}/news/filter/filter_innd.pl
+%config(noreplace) %verify(not size mtime md5) %{_datadir}/news/filter/filter_innd.py
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/news/filter/nnrpd_auth.pl
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/news/filter/nnrpd_auth.py
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/news/filter/startup_innd.pl