- some cleanups

Changed files:
    ggrelay.spec -> 1.2

diff --git a/ggrelay.spec b/ggrelay.spec
index f51fac0f28481dbbedc5055dd2a50a3a50a5ac79..741504dd0d27f4c71f07153cd8d907afe0577fe1 100644 (file)
--- a/ggrelay.spec
+++ b/ggrelay.spec
@@ -1,13 +1,14 @@
-# $Revision: 1.1 $
-
-Summary:       ggrelay is Gadu-Gadu instant messenger transparent proxy with DCC support.
-Summary(pl):   ggrelay jest przezroczystym proxy dla komunkikatora Gadu-Gadu, ze swsparciem DCC.
+# $Revision: 1.2 $
+Summary:       ggrelay - Gadu-Gadu instant messenger transparent proxy with DCC support
+Summary(pl):   ggrelay - przezroczyste proxy dla komunikatora Gadu-Gadu z obs³ug± DCC

 Name:          ggrelay
 Version:       1.0rc5
 Release:       1
 Name:          ggrelay
 Version:       1.0rc5
 Release:       1

-Group:         Networking/Utilities

 License:       GPL
 License:       GPL

+Group:         Networking/Utilities

 Source0:       %{name}-%{version}.tar.gz
 Source0:       %{name}-%{version}.tar.gz

+PreReq:                rc-scripts
+Requires(post,preun):  /sbin/chkconfig

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -20,49 +21,49 @@ intended to be the solution.
 %description -l pl
 Ta ma³a aplikacja jest prostym agentem przekazuj±cym GG. Oznacza to,
 ¿e pozwala na u¿ywanie transerów plików pomiêdzy u¿ytkownikami
 %description -l pl
 Ta ma³a aplikacja jest prostym agentem przekazuj±cym GG. Oznacza to,
 ¿e pozwala na u¿ywanie transerów plików pomiêdzy u¿ytkownikami

-Gadu-Gadu, którzy schowani s± za NATem (aka maskarad±).
+Gadu-Gadu, którzy schowani s± za NAT-em (aka maskarad±).

 
 %prep
 %setup -q
 
 %build
 
 %prep
 %setup -q
 
 %build

-%configure --prefix="$RPM_BUILD_ROOT%{_prefix}"
+%configure \
+       --prefix="$RPM_BUILD_ROOT%{_prefix}"

 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT

-rm -rf "$RPM_BUILD_ROOT"
-mkdir "$RPM_BUILD_ROOT"
+install -d $RPM_BUILD_ROOT
+

 %{__make} install
 ./install.sh --rpmbuild "$RPM_BUILD_ROOT"
 
 %{__make} install
 ./install.sh --rpmbuild "$RPM_BUILD_ROOT"
 

+%clean
+rm -rf $RPM_BUILD_ROOT
+

 %post
 /sbin/chkconfig --add ggrelay
 %post
 /sbin/chkconfig --add ggrelay

-
-echo
-echo "Installation completed. Please adjust your /etc/ggrelay/ggrelay.conf"
-echo "adding -o and possibly -i parameters."
-echo
-
-%postun
-/sbin/service sshd condrestart > /dev/null 2>&1 || :
+if [ -f /var/lock/subsys/ggrelay ]; then
+       /etc/rc.d/init.d/ggrelay restart 1>&2
+else
+       echo
+       echo "Installation completed. Please adjust your /etc/ggrelay/ggrelay.conf"
+       echo "adding -o and possibly -i parameters."
+       echo "Then run \"/etc/rc.d/init.d/ggrelay start\" to start daemon."
+       echo
+fi

 
 %preun
 if [ "$1" = 0 ]; then
 
 %preun
 if [ "$1" = 0 ]; then

-       /sbin/service ggrelay stop > /dev/null 2>&1 || :
+       if [ -f /var/lock/subsys/ggrelay ]; then
+               /etc/rc.d/init.d/ggrelay stop >&2
+       fi

        /sbin/chkconfig --del ggrelay
 fi
 
        /sbin/chkconfig --del ggrelay
 fi
 

-%clean
-rm -rf "$RPM_BUILD_ROOT"
-

 %files
 %defattr(644,root,root,755)
 %doc README COPYING
 %files
 %defattr(644,root,root,755)
 %doc README COPYING

-%config %{_sysconfdir}/ggrelay
-/etc/rc.d/init.d/ggrelay

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

-
-$Log: ggrelay.spec,v $
-Revision 1.1  2004-02-06 22:03:44  hunter
--initial pld spec.
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ggrelay
+%attr(754,root,root) /etc/rc.d/init.d/ggrelay