- release 6,

- separate rwall server into rwalld subpackage,
- use new rpm automation.

Changed files:
    rwall.spec -> 1.15

diff --git a/rwall.spec b/rwall.spec
index 0e816d8022862560d29be8f8d84dd72b2b4450c2..f13ee809b8d5971434af02d66accaf5c471732d6 100644 (file)
--- a/rwall.spec
+++ b/rwall.spec
@@ -1,18 +1,18 @@
-Summary:       Client and server for sending messages to a host's logged in users
-Summary(de):   Client und Server zum Senden von Nachrichten an Benutzer am entfernten Host
-Summary(fr):   Client et serveur pour envoyer des messages aux utilisteurs de machines distantes
-Summary(tr):   Baþka bir makinada çalýþan tüm kullanýcýlara mesaj gönderme
+Summary:       Client for sending messages to a host's logged in users
+Summary(de):   Client zum Senden von Nachrichten an Benutzer am entfernten Host
+Summary(fr):   Client  pour envoyer des messages aux utilisteurs de machines distantes
+Summary(tr):   Baþka çalýþan tüm kullanýcýlara mesaj gönderme
 Name:          rwall
 Version:       0.17
-Release:       1
+Release:       6
 License:       BSD
-Group:         Networking/Daemons
-Group(pl):     Sieciowe/Serwery
+Group:         Networking
+Group(de):     Netzwerkwesen
+Group(pl):     Sieciowe
 Source0:       ftp://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-%{name}-%{version}.tar.gz
-Source1:       rwalld.init
-Patch0:                netkit-rwall-WALL_CMD.patch
+Source1:       %{name}d.init
+Patch0:                netkit-%{name}-WALL_CMD.patch
 Prereq:                /sbin/chkconfig
-Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -20,29 +20,32 @@ The rwall command sends a message to all of the users logged into a
 specified host. Actually, your machine's rwall client sends the
 message to the rwall daemon running on the specified host, and the
 rwall daemon relays the message to all of the users logged in to that
-host. The rwall daemon is run from /etc/inetd.conf and is disabled by
-default on Red Hat Linux systems (it can be very annoying to keep
-getting all those messages when you're trying to play Quake--I mean
-trying to get some work done).
+host. 
 
 %description -l de
 Der rwall-Client sendet eine Meldung an einen rwall-Dämon, der auf
 einem entfernten Rechner läuft und die Meldung an alle Benutzer der
-des entfernten Rechners verbreitet. Der rwall-Dämon wird von
-/etc/inetd.conf betrieben und ist auf Red-Hat-Systemen standardmäßig
-deaktiviert.
+des entfernten Rechners verbreitet.
 
 %description -l fr
 Le client rwall envoie un message à un démon rwall tournant sur une
 machine distante, qui relaie le message vers tous les utilisateurs de
-la machine distante. Le démon rwall est lancé depuis /etc/inetd.conf,
-et est desactivé par défaut sur les systèmes Red Hat.
+la machine distante.
 
 %description -l tr
 Bir rwall sunucusu kendisine istemci tarafýndan gönderilen bir mesajý
-o anda çalýþan tüm kullanýcýlara yansýtýr. Bu paket hem istemciyi hem
-sunucuyu içermektedir ve /etc/inetd.conf'tan çalýþtýrýlmaktadýr.
-Öntanýmlý olarak bu hizmet kullaným dýþý býrakýlmýþtýr.
+o anda çalýþan tüm kullanýcýlara yansýtýr.
+
+%package -n rwalld
+Summary:       Server for sending messages to a host's logged in users
+Group:         Networking/Daemons
+Group(de):     Netzwerkwesen/Server
+Group(pl):     Sieciowe/Serwery
+Requires:      rc-scripts
+Obsoletes:     rwall-server
+
+%description -n rwalld
+Server for sending messages to a host's logged in users.
 
 %prep
 %setup -q -n netkit-rwall-%{version}
@@ -50,7 +53,7 @@ sunucuyu i
 
 %build
 ./configure --installroot=$RPM_BUILD_ROOT
-%{__make} CFLAGS="$RPM_OPT_FLAGS"
+%{__make} CFLAGS="%{!?debug:$RPM_OPT_FLAGS}%{?debug:-O -g}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -63,14 +66,10 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/rwalld
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/rwalld.8
 echo ".so rpc.rwalld.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rwalld.8
 
-strip --strip-unneeded $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/* || :
-
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man{1,8}/*
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post -n rwalld
 /sbin/chkconfig --add rwalld
 if [ -f /var/lock/subsys/rwalld ]; then
        /etc/rc.d/init.d/rwalld restart 1>&2
@@ -78,7 +77,7 @@ else
        echo "Type \"/etc/rc.d/init.d/rwalld start\" to start rwalld server" 1>&2
 fi
        
-%postun
+%postun -n rwalld
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/rwalld ]; then
                /etc/rc.d/init.d/rwalld stop 1>&2
@@ -88,9 +87,11 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%attr(754,root,root) %config /etc/rc.d/init.d/rwalld
 %attr(755,root,root) %{_bindir}/rwall
+%{_mandir}/man1/rwall.1*
+
+%files -n rwalld
+%attr(754,root,root) %config /etc/rc.d/init.d/rwalld
 %attr(755,root,root) %{_sbindir}/rpc.rwalld
 %{_mandir}/man8/rpc.rwalld.8*
 %{_mandir}/man8/rwalld.8*
-%{_mandir}/man1/rwall.1*