- release 26 (in rawhide is now 25),

- removed from all %description sentence about /etc/inetd.conf,
- added proper %post/%postun scripts with restarting rc-inetd on install,
  upgrade and remove package,
- Requires: rc-inetd changed to Prereq,
- added exact patch ftpm rawhide,
- added Obsoletes: fingerd,
- more rpm macros.

Changed files:
    bsd-finger.spec -> 1.19

diff --git a/bsd-finger.spec b/bsd-finger.spec
index 7bc077a634aa6d6d20c33f23465c293df1f121b0..9e2c87a1552364a140028e709925f6baea18109c 100644 (file)
--- a/bsd-finger.spec
+++ b/bsd-finger.spec
@@ -5,7 +5,7 @@ Summary(pl):    Serwer finger
 Summary(tr):   Finger sunucusu
 Name:          finger
 Version:       0.10
-Release:       25
+Release:       26
 Copyright:     BSD
 Group:         Networking/Daemons
 Group(pl):     Sieciowe/Serwery
@@ -19,28 +19,25 @@ Patch3:             bsd-finger-ipv6.patch
 Patch4:                bsd-finger-maint.patch
 Patch5:                bsd-finger-timeout.patch
 Patch6:                bsd-finger-pts.patch
-Prereq:                /etc/rc.d/init.d/rc-inetd
-Requires:      rc-inetd
+Patch7:                bsd-finger-exact.patch
+Prereq:                rc-inetd
 Provides:      fingerd
+Obsoletes:     fingerd
 BuildRoot:     /tmp/%{name}-%{version}-root
 
 %description
 Finger is a simple protocol which allows users to find information about
 users on other machines. This package includes a standard finger server. 
-The server runs from /etc/inetd.conf, which must be modified to disable 
-finger requests.
 
 %description -l de
 Finger ist ein einfaches Protokoll, das Informationen über Benutzer 
 auf anderen Rechnern herausfindet. Dieses Paket enthält einen 
-standardmäßigen Finger-Server. Der Server läuft in /etc/inetd.conf, 
-für das Finger-Anforderungen deaktiviert werden müssen.
+standardmäßigen Finger-Server.
 
 %description -l fr
 finger est un protocole simple permettant de trouver des informations sur
 les utilisateurs d'autres machines. Ce paquetage contient un serveur finger
-standard. Le serveur est lancé à partir de /etc/inetd.conf,
-qui doit être modifié pour désactiver les requêtes finger.
+standard.
 
 %description -l pl
 Finger jest prostym protoko³em, który umo¿liwia wyszukiwanie informacji
@@ -49,9 +46,7 @@ o u
 %description -l tr
 finger, að baðlantýsý bulunan makinalarda çalýþan kullanýcýlar hakkýnda 
 kýsa bilgi veren bir hizmettir. Bu pakette standart bir finger sunucusu 
-bulunmaktadýr. Sunucu öntanýmlý olarak çalýþýr durumdadýr, çalýþmasýný 
-istemiyorsanýz /etc/inetd.conf içerisinde ilgili satýrlarda deðiþiklik 
-yapmanýz gerekecektir.
+bulunmaktadýr.
 
 %package -n finger-client
 Summary:        Finger client 
@@ -94,13 +89,15 @@ bulunmaktad
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{usr/{bin,sbin,share/man/{man1,man8,pl/man1}},etc/sysconfig/rc-inetd}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/{man{1,8},pl/man1}} \
+       $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd
 
 make INSTALLROOT=$RPM_BUILD_ROOT MANDIR=%{_mandir} install
 
@@ -111,9 +108,21 @@ mv -f $RPM_BUILD_ROOT%{_mandir}/man8/in.fingerd.8 \
 install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/pl/man1/finger.1
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/fingerd
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/{man1,man8,pl/man1}/* \
+gzip -9nf $RPM_BUILD_ROOT%{_mandir}/{man?/*,pl/man1/*} \
        README BUGS
 
+%post 
+if [ -f /var/lock/subsys/rc-inetd ]; then
+       /etc/rc.d/init.d/rc-inetd restart 1>&2
+else
+       echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet sever" 1>&2
+fi
+
+%postun
+if [ -f /var/lock/subsys/rc-inetd ]; then
+       /etc/rc.d/init.d/rc-inetd restart
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT