Author: glen Date: Wed May 28 19:25:51 2008 GMT Module: SPECS Tag: AC-branch ---- Log message: - rel 22 for fc2 upgrade - merged changes from HEAD
---- Files affected: SPECS: rsh.spec (1.37.2.2 -> 1.37.2.3) ---- Diffs: ================================================================ Index: SPECS/rsh.spec diff -u SPECS/rsh.spec:1.37.2.2 SPECS/rsh.spec:1.37.2.3 --- SPECS/rsh.spec:1.37.2.2 Wed May 28 21:24:19 2008 +++ SPECS/rsh.spec Wed May 28 21:25:45 2008 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Klient rsh i polecenie rcp Name: rsh Version: 0.17 -Release: 11 +Release: 22 License: BSD Group: Applications/Networking Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-%{name}-%{version}.tar.gz @@ -26,8 +26,10 @@ Patch7: netkit-%{name}-rlogin=rsh.patch Patch8: netkit-%{name}-nokrb.patch BuildRequires: pam-devel +BuildRequires: rpmbuild(macros) >= 1.268 Requires: pam >= 0.79.0 Obsoletes: heimdal-rsh +Obsoletes: krb5-rsh BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -46,6 +48,7 @@ Requires: pam >= 0.77.3 Requires: rc-inetd Obsoletes: heimdal-rshd +Obsoletes: krb5-kshd Obsoletes: rsh-server %description -n rshd @@ -62,6 +65,7 @@ Summary(pl.UTF-8): Klient rlogin Group: Applications/Networking Obsoletes: heimdal-rlogin +Obsoletes: krb5-rlogin %description -n rlogin The rlogin package contains a program which allow users to login on @@ -79,6 +83,7 @@ Requires: pam >= 0.77.3 Requires: rc-inetd Obsoletes: heimdal-rlogin +Obsoletes: krb5-klogind Obsoletes: rsh-server %description -n rlogind @@ -93,7 +98,6 @@ Summary: rexec client Summary(pl.UTF-8): Klient rexec Group: Applications/Networking -Obsoletes: heimdal-rexec Obsoletes: rsh-server %description -n rexec @@ -110,7 +114,6 @@ Group: Applications/Networking Requires: pam >= 0.77.3 Requires: rc-inetd -Obsoletes: heimdal-rexecd %description -n rexecd The rexecd package contains a server which allow users to execute @@ -137,9 +140,11 @@ %build ./configure \ - --with-c-compiler=%{__cc} + --with-c-compiler="%{__cc}" %{__make} \ - CFLAGS="%{rpmcflags}" + CC="%{__cc}" \ + CFLAGS="%{rpmcflags}" \ + LDFLAGS="%{rpmldflags}" %install rm -rf $RPM_BUILD_ROOT @@ -169,39 +174,27 @@ rm -rf $RPM_BUILD_ROOT %post -n rshd -if [ -f /var/lock/subsys/rc-inetd ]; then - /etc/rc.d/init.d/rc-inetd reload 1>&2 -else - echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2 -fi +%service -q rc-inetd reload %postun -n rshd -if [ -f /var/lock/subsys/rc-inetd ]; then - /etc/rc.d/init.d/rc-inetd reload +if [ "$1" = 0 ]; then + %service -q rc-inetd reload fi %post -n rlogind -if [ -f /var/lock/subsys/rc-inetd ]; then - /etc/rc.d/init.d/rc-inetd reload 1>&2 -else - echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2 -fi +%service -q rc-inetd reload %postun -n rlogind -if [ -f /var/lock/subsys/rc-inetd ]; then - /etc/rc.d/init.d/rc-inetd reload +if [ "$1" = 0 ]; then + %service -q rc-inetd reload fi %post -n rexecd -if [ -f /var/lock/subsys/rc-inetd ]; then - /etc/rc.d/init.d/rc-inetd reload 1>&2 -else - echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2 -fi +%service -q rc-inetd reload %postun -n rexecd -if [ -f /var/lock/subsys/rc-inetd ]; then - /etc/rc.d/init.d/rc-inetd reload +if [ "$1" = 0 ]; then + %service -q rc-inetd reload fi %files @@ -251,6 +244,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37.2.3 2008-05-28 19:25:45 glen +- rel 22 for fc2 upgrade +- merged changes from HEAD + Revision 1.37.2.2 2008-05-28 19:24:19 glen - adapter ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rsh.spec?r1=1.37.2.2&r2=1.37.2.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
