--- ../inn.spec 2005-02-12 10:51:13 +0200 +++ inn.spec 2005-10-20 13:26:53 +0300 @@ -1,13 +1,14 @@ Name: inn -Version: 2.4.1 -Release: alt7 +Version: 2.4.2 +Release: alt0 Summary: The InterNetNews (INN) system, an Usenet news server License: GPL Group: System/Servers -Source0: ftp://ftp.isc.org/isc/inn/inn-%version.tar.bz2 +Url: http://www.isc.org/products/INN +Source0: ftp://ftp.isc.org/isc/inn/inn-%version.tar.gz Source1: %name-default-active Source2: %name-default-distributions Source3: %name-default-newsgroups @@ -112,16 +113,16 @@ %set_autoconf_version 2.13 %__rm -f config.cache -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%optflags" %__libtoolize --copy --force %__autoconf ./configure %_target_platform \ --prefix=%prefix \ --sysconfdir=%_sysconfdir/news \ --mandir=%_mandir \ - --with-log-dir=%_var/log/inn \ - --with-syslog-dir=%_var/log/news \ - --with-spool-dir=%_var/spool/news\ + --with-log-dir=%_logdir/inn \ + --with-syslog-dir=%_logdir/news \ + --with-spool-dir=%_spooldir/news\ --with-db-dir=%_localstatedir/news \ --with-run-dir=%_var/run/news \ --with-etc-dir=%_sysconfdir/news \ @@ -149,54 +150,54 @@ %make %install -%make install DESTDIR=$RPM_BUILD_ROOT +%make install DESTDIR=%buildroot # -- Install man pages needed by suck et al. #for f in clibrary.h config.h dbz.h libinn.h storage.h; do -# %__install -pD -m644 ./include/$f "$RPM_BUILD_ROOT%_includedir/%name/$f" +# %__install -pD -m644 ./include/$f "%buildroot%_includedir/%name/$f" #done -touch $RPM_BUILD_ROOT%_localstatedir/news/subscriptions -%__chmod 644 $RPM_BUILD_ROOT%_localstatedir/news/subscriptions +touch %buildroot%_localstatedir/news/subscriptions +%__chmod 644 %buildroot%_localstatedir/news/subscriptions #%__install -m 644 $RPM_SOURCE_DIR/inn-default-active \ -# $RPM_BUILD_ROOT%_localstatedir/news/active +# %buildroot%_localstatedir/news/active %__install -m 644 $RPM_SOURCE_DIR/inn-default-distributions \ - $RPM_BUILD_ROOT%_localstatedir/news/distributions + %buildroot%_localstatedir/news/distributions %__install -m 644 $RPM_SOURCE_DIR/inn-default-newsgroups \ - $RPM_BUILD_ROOT%_localstatedir/news/newsgroups + %buildroot%_localstatedir/news/newsgroups -%__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/cron.hourly $RPM_BUILD_ROOT%_sysconfdir/cron.daily +%__mkdir_p %buildroot%_sysconfdir/cron.hourly %buildroot%_sysconfdir/cron.daily %__install -m755 $RPM_SOURCE_DIR/inn-cron-expire \ - $RPM_BUILD_ROOT%_sysconfdir/cron.daily/inn-cron-expire + %buildroot%_sysconfdir/cron.daily/inn-cron-expire %__install -m755 $RPM_SOURCE_DIR/inn-cron-rnews \ - $RPM_BUILD_ROOT%_sysconfdir/cron.hourly/inn-cron-rnews + %buildroot%_sysconfdir/cron.hourly/inn-cron-rnews %__install -m755 $RPM_SOURCE_DIR/inn-cron-nntpsend \ - $RPM_BUILD_ROOT%_sysconfdir/cron.hourly/inn-cron-nntpsend + %buildroot%_sysconfdir/cron.hourly/inn-cron-nntpsend %__install -m440 $RPM_SOURCE_DIR/inn-etc-nnrp.access \ - $RPM_BUILD_ROOT%_sysconfdir/news/nnrp.access + %buildroot%_sysconfdir/news/nnrp.access -%__mkdir_p $RPM_BUILD_ROOT%_initdir +%__mkdir_p %buildroot%_initdir %__install -m 755 %SOURCE8 \ - $RPM_BUILD_ROOT%_initdir/innd + %buildroot%_initdir/innd -%__rm -f $RPM_BUILD_ROOT%_localstatedir/news/history -touch $RPM_BUILD_ROOT%_localstatedir/news/history -%__chmod 644 $RPM_BUILD_ROOT%_localstatedir/news/* +%__rm -f %buildroot%_localstatedir/news/history +touch %buildroot%_localstatedir/news/history +%__chmod 644 %buildroot%_localstatedir/news/* #Fix perms in sample directory to avoid bogus dependencies find samples -name "*.in" -exec chmod a-x {} \; -%__mkdir_p $RPM_BUILD_ROOT%_var/spool/news/articles -%__mkdir_p $RPM_BUILD_ROOT%_var/spool/news/overview -%__mkdir_p $RPM_BUILD_ROOT%_var/spool/news/archive -%__mkdir_p $RPM_BUILD_ROOT%_var/spool/news/incoming/bad -%__mkdir_p $RPM_BUILD_ROOT%_var/spool/news/outgoing -%__mkdir_p $RPM_BUILD_ROOT%_var/spool/news/uniover -%__mkdir_p $RPM_BUILD_ROOT%_var/spool/news/innfeed -%__mkdir_p $RPM_BUILD_ROOT%_var/log/inn -%__mkdir_p $RPM_BUILD_ROOT%_var/run/news/tmp +%__mkdir_p %buildroot%_spooldir/news/articles +%__mkdir_p %buildroot%_spooldir/news/overview +%__mkdir_p %buildroot%_spooldir/news/archive +%__mkdir_p %buildroot%_spooldir/news/incoming/bad +%__mkdir_p %buildroot%_spooldir/news/outgoing +%__mkdir_p %buildroot%_spooldir/news/uniover +%__mkdir_p %buildroot%_spooldir/news/innfeed +%__mkdir_p %buildroot%_logdir/inn +%__mkdir_p %buildroot%_var/run/news/tmp %post #if [ `%__cat %_sysconfdir/news/inn.conf | %__grep '^server:' | wc -l` -lt 1 ]; then @@ -216,16 +217,16 @@ %doc doc/checklist doc/compliance-nntp doc/config-design doc/config-semantics doc/config-syntax doc/external-auth %doc doc/history doc/hook-perl doc/hook-python doc/hook-tcl doc/IPv6-info doc/sample-control %defattr(3770,root,news) -%dir %_var/spool/news -%dir %_var/spool/news/articles -%dir %_var/spool/news/overview -%dir %_var/spool/news/archive -%dir %_var/spool/news/incoming -%dir %_var/spool/news/incoming/bad -%dir %_var/spool/news/outgoing -%dir %_var/spool/news/uniover -%dir %_var/spool/news/innfeed -%dir %_var/log/%name +%dir %_spooldir/news +%dir %_spooldir/news/articles +%dir %_spooldir/news/overview +%dir %_spooldir/news/archive +%dir %_spooldir/news/incoming +%dir %_spooldir/news/incoming/bad +%dir %_spooldir/news/outgoing +%dir %_spooldir/news/uniover +%dir %_spooldir/news/innfeed +%dir %_logdir/%name %dir %_var/run/news %dir %_var/run/news/tmp %dir %_localstatedir/news @@ -260,11 +261,9 @@ %attr(644,root,news) %config(noreplace) %_sysconfdir/news/storage.conf %attr(644,root,news) %config(noreplace) %_sysconfdir/news/subscriptions -%defattr(-,root,root) -%dir %_libdir/%name %_man5dir/* %_man8dir/* -%_libdir/%name/* +%_libdir/%name/ %_bindir/ovdb_init %_bindir/ovdb_monitor %_bindir/ovdb_server @@ -379,6 +378,11 @@ %_man1dir/inews* %changelog +* Thu Oct 20 2005 Michael Shigorin 2.4.2-alt0 +- 2.4.2 +- minor spec cleanup; Url added +- rebuilt so as to avoid #2601 + * Sat Feb 12 2005 Konstantin Timoshenko 2.4.1-alt7 - rebuild with BerkeleyDB 4.3