misc changes for correct build and FHS 2.0

-- now at is runnig as root instead daemon

Changed files:
    at.spec -> 1.20

diff --git a/at.spec b/at.spec
index 884f2c6ef154d5caad9c5364bc2a26cdedc6099a..7f4abcf43feabd73dc4a36edc336fda07c7b6e80 100644 (file)
--- a/at.spec
+++ b/at.spec
@@ -5,17 +5,18 @@ Summary(pl):  Demon kontroli zada
 Summary(tr):   þ düzenleyici
 Name:          at
 Version:       3.1.8
 Summary(tr):   þ düzenleyici
 Name:          at
 Version:       3.1.8

-Release:       7
+Release:       8

 Copyright:     GPL
 Group:         Daemons
 Group(pl):     Serwery
 Copyright:     GPL
 Group:         Daemons
 Group(pl):     Serwery

-Source0:       ftp://jurix.jura.uni-sb.de/pub/linux/sources/system/daemons/%{name}-%{version}.tar.gz
+Url:           ftp://jurix.jura.uni-sb.de/pub/linux/sources/system/daemons
+Source0:       %{name}-%{version}.tar.gz

 Source1:       atd.init
 Source1:       atd.init

+Source2:       at.sysconfig

 Patch0:                at-lockfile.patch
 Patch1:                at-install.patch
 Patch2:                at-man.patch
 Patch0:                at-lockfile.patch
 Patch1:                at-install.patch
 Patch2:                at-man.patch

-Patch3:                at-batch.patch
-Patch4:                at.patch
+Patch3:                at.patch

 Prereq:                fileutils
 Prereq:                /sbin/chkconfig
 Requires:      mailx
 Prereq:                fileutils
 Prereq:                /sbin/chkconfig
 Requires:      mailx


@@ -47,30 +48,32 @@ standart giri
 %patch1 -p1 
 %patch2 -p1 
 %patch3 -p1 
 %patch1 -p1 
 %patch2 -p1 
 %patch3 -p1 

-%patch4 -p1 

 
 %build
 
 %build

-autoconf
+aclocal && autoconf

 CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
 CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \

-./configure %{_target} \
+    ./configure \

        --with-atspool=/var/spool/at/spool \
        --with-jobdir=/var/spool/at \
        --with-atspool=/var/spool/at/spool \
        --with-jobdir=/var/spool/at \

-       --with-etcdir=/etc/at
+       --with-etcdir=/etc/at \
+       --with-daemon_username=root \
+       --with-daemon_groupname=root \
+       --mandir=%{_mandir} %{_target_platform}

 make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}

 
 

-make install IROOT=$RPM_BUILD_ROOT
+make \
+    IROOT=$RPM_BUILD_ROOT \
+    install

 
 

-install at.deny $RPM_BUILD_ROOT/etc/at/at.deny
-touch   $RPM_BUILD_ROOT/etc/at/at.allow
-
-mv $RPM_BUILD_ROOT/usr/doc/at $RPM_BUILD_ROOT/usr/doc/%{name}-%{version}
+install at.deny $RPM_BUILD_ROOT/etc/at

 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/atd
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/atd

+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/at

 
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{atq,atrm,batch}.1
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/at_deny.5
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{atq,atrm,batch}.1
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/at_deny.5


@@ -92,9 +95,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add atd
 
 %post
 /sbin/chkconfig --add atd

-if test -r /var/run/atd.pid; then
-       /etc/rc.d/init.d/atd stop >&2
-       /etc/rc.d/init.d/atd start >&2
+if [ -f /var/lock/subsys/atd ]; then
+       /etc/rc.d/init.d/atd restart >&2

 else
        echo "Run \"/etc/rc.d/init.d/atd start\" to start atd daemon."
 fi
 else
        echo "Run \"/etc/rc.d/init.d/atd start\" to start atd daemon."
 fi


@@ -111,10 +113,12 @@ fi
 
 %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 /etc/at
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/at/*

-%attr(754,root,root) /etc/rc.d/init.d/atd
+%attr(640,root,root) %config %verify(not size mtime md5) /etc/sysconfig/*
+
+%attr(755,root,root) /etc/rc.d/init.d/atd

 %attr(755,root,root) %{_sbindir}/*
 
 %attr(755,root,root) %{_sbindir}/*
 

-%attr(4755,root,root) %{_bindir}/at
+%attr(4711,root,root) %{_bindir}/at

 
 %attr(755,root,root) %{_bindir}/atq
 %attr(755,root,root) %{_bindir}/atrm
 
 %attr(755,root,root) %{_bindir}/atq
 %attr(755,root,root) %{_bindir}/atrm


@@ -122,11 +126,14 @@ fi
 
 %{_mandir}/man[158]/*
 
 
 %{_mandir}/man[158]/*
 

-%attr(700,daemon,daemon) %dir /var/spool/at
-%attr(700,daemon,daemon) %dir /var/spool/at/spool
-%attr(600,daemon,daemon) %ghost /var/spool/at/.SEQ
+%attr(750,root,root) %dir /var/spool/at
+%attr(750,root,root) %dir /var/spool/at/spool
+%attr(600,root,root) %ghost /var/spool/at/.SEQ

 
 %changelog
 
 %changelog

+* Tue Jun 01 1999 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
+-  misc changes -- FHS 2.0 ready
+

 * Sun May  9 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
   [3.1.8-7]
 - now package is FHS 2.0 compliant,
 * Sun May  9 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
   [3.1.8-7]
 - now package is FHS 2.0 compliant,