- release 14,

- spec adapetrized,
- added pl man pages,
- more rpm macros.

Changed files:
    at.spec -> 1.26

diff --git a/at.spec b/at.spec
index 00697ec17c4fe48bb307a2f3b1a077157e6284d1..fbb16ae9401fe7f20e70e0ffd76eb43c68d75012 100644 (file)
--- a/at.spec
+++ b/at.spec
@@ -1,43 +1,51 @@
 Summary:       at job spooler
 Summary(de):   at-Job-Spooler
-Summary(fr):   Gestionnaire de taches at.
+Summary(fr):   Gestionnaire de taches at
 Summary(pl):   Demon kontroli zadañ
 Summary(tr):   þ düzenleyici
 Name:          at
 Version:       3.1.8
-Release:       8
-Copyright:     GPL
+Release:       14
+License:       GPL
 Group:         Daemons
 Group(pl):     Serwery
-Url:           ftp://jurix.jura.uni-sb.de/pub/linux/sources/system/daemons
-Source0:       %{name}-%{version}.tar.gz
+Source0:       ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/%{name}-%{version}.tar.gz
 Source1:       atd.init
 Source2:       at.sysconfig
+Source3:       at.1.pl
+Source4:       at_allow.5.pl
+Source5:       atd.8.pl
+Source6:       atrun.8.pl
 Patch0:                at-lockfile.patch
 Patch1:                at-install.patch
 Patch2:                at-man.patch
 Patch3:                at.patch
+Patch4:                at-typo.patch
+Patch5:                at-sigchld.patch
 Prereq:                fileutils
 Prereq:                /sbin/chkconfig
 Requires:      mailx
 Requires:      rc-scripts
 Buildroot:     /tmp/%{name}-%{version}-root
 
+%define                _sysconfdir     /etc/at
+
 %description
-at and batch read commands from standard input or a specified file
-which are to be executed at a later time, using /bin/sh.
+at and batch read commands from standard input or a specified file which
+are to be executed at a later time, using /bin/sh.
 
 %description -l de
-Stapelverarbeitung von Lesebefehlen von einer Standard- oder einer 
+Stapelverarbeitung von Lesebefehlen von einer Standard- oder einer
 genannten Datei zu einem späteren Zeitpunkt unter Verwendung von /bin/sh.
 
 %description -l fr
-at et batch lisent, sur l'entrée standard ou dans un fichier, des
-commandes qui doivent être exécutées plus tard en utilisant /bin/sh.
+at et batch lisent, sur l'entrée standard ou dans un fichier, des commandes
+qui doivent être exécutées plus tard en utilisant /bin/sh.
 
 %description -l pl
-At i batch czytaj± komendy ze standardowego wej¶cia lub specyficznego pliku,
-które s± nastêpnie wykonywane o okre¶lonej godzinie, przy pomocy /bin/sh.
+At i batch czytaj± komendy ze standardowego wej¶cia lub specyficznego
+pliku, które s± nastêpnie wykonywane o okre¶lonej godzinie, przy pomocy
+/bin/sh.
 
 %description -l tr
 at ve batch /bin/sh kabuðunu kullanarak, belli bir saatte çalýþtýrmak üzere
@@ -49,29 +57,28 @@ standart giri
 %patch1 -p1 
 %patch2 -p1 
 %patch3 -p1 
+%patch4 -p1 
+%patch5 -p1 
 
 %build
-aclocal && autoconf
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-    ./configure \
+aclocal
+autoconf
+LDFLAGS="-s"; export LDFLAGS
+%configure \
        --with-atspool=/var/spool/at/spool \
        --with-jobdir=/var/spool/at \
-       --with-etcdir=/etc/at \
+       --with-etcdir=%{_sysconfdir} \
        --with-daemon_username=root \
-       --with-daemon_groupname=root \
-       --mandir=%{_mandir} %{_target_platform}
+       --with-daemon_groupname=root
 make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_mandir}/pl/man{1,5,8}}
 
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
-
-make \
-    IROOT=$RPM_BUILD_ROOT \
-    install
+make IROOT=$RPM_BUILD_ROOT install
 
-install at.deny $RPM_BUILD_ROOT/etc/at
+install at.deny $RPM_BUILD_ROOT%{_sysconfdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/atd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/at
@@ -86,9 +93,19 @@ echo .so at.1 > $RPM_BUILD_ROOT%{_mandir}/man1/batch.1
 echo .so at_allow.5 > $RPM_BUILD_ROOT%{_mandir}/man5/at_deny.5
 echo .so at_allow.5 > $RPM_BUILD_ROOT%{_mandir}/man5/at_acces.5
 
+install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1/at.1
+echo ".so at.1" > $RPM_BUILD_ROOT%{_mandir}/pl/man1/atq.1
+echo ".so at.1" > $RPM_BUILD_ROOT%{_mandir}/pl/man1/atrm.1
+echo ".so at.1" > $RPM_BUILD_ROOT%{_mandir}/pl/man1/batch.1
+install %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/pl/man5/at_allow.5
+echo ".so at_allow.5" > $RPM_BUILD_ROOT%{_mandir}/pl/man5/at.access.5
+echo ".so at_allow.5" > $RPM_BUILD_ROOT%{_mandir}/pl/man5/at.deny.5
+install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/pl/man8/atd.8
+install %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/pl/man8/atrun.8
+
 touch $RPM_BUILD_ROOT/var/spool/at/.SEQ
 
-gzip -9fn $RPM_BUILD_ROOT%{_mandir}/man[158]/* \
+gzip -9nf $RPM_BUILD_ROOT%{_mandir}/{man*/*,pl/man?/*} \
        ChangeLog README
 
 %clean
@@ -104,28 +121,31 @@ fi
 
 %preun
 if [ "$1" = "0" ] ; then
+       if [ -f /var/lock/subsys/atd ]; then
+               /etc/rc.d/init.d/atd stop >&2
+       fi
        /sbin/chkconfig --del atd
-       /etc/rc.d/init.d/atd stop >&2
 fi
 
 %files
-%defattr(644,root,root,755) 
+%defattr(644,root,root,755)
 %doc {ChangeLog,README}.gz
 
-%attr(750,root,root) %dir /etc/at
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/at/*
+%attr(750,root,root) %dir %{_sysconfdir}
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*
 %attr(640,root,root) %config %verify(not size mtime md5) /etc/sysconfig/*
 
 %attr(754,root,root) /etc/rc.d/init.d/atd
 %attr(755,root,root) %{_sbindir}/*
 
-%attr(4711,root,root) %{_bindir}/at
+%attr(4755,root,root) %{_bindir}/at
 
 %attr(755,root,root) %{_bindir}/atq
 %attr(755,root,root) %{_bindir}/atrm
 %attr(755,root,root) %{_bindir}/batch
 
-%{_mandir}/man[158]/*
+%{_mandir}/man*/*
+%lang(pl) %{_mandir}/pl/man*/*
 
 %attr(750,root,root) %dir /var/spool/at
 %attr(750,root,root) %dir /var/spool/at/spool