- separate ipv6 binary is no longer required

Changed files:
    xinetd.inet.sh -> 1.11
    xinetd.spec -> 1.54

diff --git a/xinetd.inet.sh b/xinetd.inet.sh
index 6347ec9208058d7b361c895f1ec62d0e10098a32..034a9273976990eb76e16e100fcc9e738da53db2 100644 (file)
--- a/xinetd.inet.sh
+++ b/xinetd.inet.sh
@@ -9,11 +9,7 @@ CONFIG_FILE_UMASK=027
 . /etc/rc.d/init.d/functions
 . /etc/sysconfig/network
 
-if is_yes "$IPV6_NETWORKING" && [ -x /usr/sbin/xinetd-ipv6 ]; then                                            
-    INETDAEMON="/usr/sbin/xinetd-ipv6"
-else
-    INETDAEMON="/usr/sbin/xinetd"
-fi
+INETDAEMON="/usr/sbin/xinetd"
 
 # addytional inet server daemon argumments
 INETDAEMON_ARGS=

diff --git a/xinetd.spec b/xinetd.spec
index 34c1e48b64e399c2b12f65e540b000c83c59c457..f9be79e4e00bfd9c0328c9c8d6865157bc405bc2 100644 (file)
--- a/xinetd.spec
+++ b/xinetd.spec
@@ -5,7 +5,7 @@ Summary(ru):    xinetd - 
 Summary(uk):   xinetd - ÂÁÇÁÔÁ ÍÏÖÌÉ×ÏÓÔÑÍÉ ÚÁͦÎÁ inetd
 Name:          xinetd
 Version:       2.3.12
-Release:       1
+Release:       2
 Group:         Daemons
 License:       BSD-like
 Source0:       http://www.xinetd.org/%{name}-%{version}.tar.gz
@@ -104,14 +104,6 @@ xinetd 
 %build
 %{__aclocal}
 %{__autoconf}
-%configure  \
-       --with-libwrap \
-       --with-inet6  \
-       --with-loadavg
-%{__make}
-cp xinetd/xinetd xinetd/xinetd-ipv6
-%{__make} clean
-rm -f config.cache
 %configure  \
        --with-libwrap \
        --with-loadavg
@@ -124,7 +116,6 @@ install -d $RPM_BUILD_ROOT%{_sbindir} \
        $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig}
 
 install xinetd/xinetd $RPM_BUILD_ROOT%{_sbindir}
-install xinetd/xinetd-ipv6 $RPM_BUILD_ROOT%{_sbindir}
 install xinetd/itox $RPM_BUILD_ROOT%{_sbindir}
 install xinetd/xinetd.conf.man $RPM_BUILD_ROOT%{_mandir}/man5/xinetd.conf.5
 install xinetd/xinetd.log.man $RPM_BUILD_ROOT%{_mandir}/man8/xinetd.log.8