Removed obsoletes: yppasswd, spec file cleanup

This commit is contained in:
Karel Klíč 2010-03-01 12:06:58 +00:00
parent 430c9ef7b0
commit 5d55c6a792
1 changed files with 14 additions and 13 deletions

View File

@ -26,7 +26,6 @@ Patch3: ypserv-2.13-ypxfr-zeroresp.patch
Patch4: ypserv-2.19-inval-ports.patch
Patch5: ypserv-2.13-nonedomain.patch
Patch6: ypserv-2.19-slp-warning.patch
Obsoletes: yppasswd
BuildRequires: gdbm-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -84,12 +83,12 @@ cat >$RPM_BUILD_ROOT/etc/sysconfig/yppasswdd <<EOF
# and /etc/shadow.
#ETCDIR=/etc
# This options tells rpc.yppasswdd to use a different source file
# This option tells rpc.yppasswdd to use a different source file
# instead of /etc/passwd
# You can't mix usage of this with ETCDIR
#PASSWDFILE=/etc/passwd
# This options tells rpc.yppasswdd to use a different source file
# This option tells rpc.yppasswdd to use a different source file
# instead of /etc/passwd.
# You can't mix usage of this with ETCDIR
#SHADOWFILE=/etc/shadow
@ -108,19 +107,19 @@ rm -rf $RPM_BUILD_ROOT
%preun
if [ $1 = 0 ]; then
/sbin/service ypserv stop > /dev/null 2>&1
/sbin/chkconfig --del ypserv
/sbin/service yppasswdd stop > /dev/null 2>&1
/sbin/chkconfig --del yppasswdd
/sbin/service ypxfrd stop > /dev/null 2>&1
/sbin/chkconfig --del ypxfrd
/sbin/service ypserv stop > /dev/null 2>&1
/sbin/chkconfig --del ypserv
/sbin/service yppasswdd stop > /dev/null 2>&1
/sbin/chkconfig --del yppasswdd
/sbin/service ypxfrd stop > /dev/null 2>&1
/sbin/chkconfig --del ypxfrd
fi
%postun
if [ "$1" -ge "1" ]; then
/sbin/service ypserv condrestart > /dev/null 2>&1
/sbin/service yppasswdd condrestart > /dev/null 2>&1
/sbin/service ypxfrd condrestart > /dev/null 2>&1
/sbin/service ypserv condrestart > /dev/null 2>&1
/sbin/service yppasswdd condrestart > /dev/null 2>&1
/sbin/service ypxfrd condrestart > /dev/null 2>&1
fi
exit 0
@ -142,11 +141,13 @@ exit 0
%changelog
* Mon Mar 01 2010 Karel Klic <kklic@redhat.com> - 2.23-2
- Added COPYING file to the package
- Removed Obsoletes: yppasswd
- Spec file cleanup
* Wed Feb 24 2010 Karel Klic <kklic@redhat.com> - 2.23-1
- Updated to new upstream version
- Removed pidfile and nodbclose patches, as those were
merged by the upstream.
merged by the upstream
* Thu Jan 28 2010 Karel Klic <kklic@redhat.com> - 2.21-4
- Removed ypserv-2.21-iface.patch, because upstream refused to