SPECS (AC-branch): cvs.spec - cvs-client virtual, avoid /bin/sh de...

[glen]

Author: glen                         Date: Tue Mar 25 23:15:56 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- cvs-client virtual, avoid /bin/sh dep in scriptlets; rel 6

---- Files affected:
SPECS:
   cvs.spec (1.167.2.1 -> 1.167.2.2) 

---- Diffs:

================================================================
Index: SPECS/cvs.spec
diff -u SPECS/cvs.spec:1.167.2.1 SPECS/cvs.spec:1.167.2.2
--- SPECS/cvs.spec:1.167.2.1	Wed Mar 26 00:14:13 2008
+++ SPECS/cvs.spec	Wed Mar 26 00:15:51 2008
@@ -15,7 +15,7 @@
 Summary(zh_CN.UTF-8):	并发的版本管理系统CVS
 Name:		cvs
 Version:	1.11.21
-Release:	5
+Release:	6
 License:	GPL
 Group:		Development/Version Control
 # new: ftp://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{version}.tar.bz2
@@ -41,6 +41,8 @@
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	texinfo
 BuildRequires:	zlib-devel
+Provides:	cvs-client = %{version}
+Obsoletes:	cvs-client
 Obsoletes:	cvs-nserver-client
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -242,11 +244,11 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post	-p	/sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun	-p	/sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %pre pserver
 %groupadd -f -g 52 cvs
@@ -290,6 +292,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.167.2.2  2008-03-25 23:15:51  glen
+- cvs-client virtual, avoid /bin/sh dep in scriptlets; rel 6
+
 Revision 1.167.2.1  2008-03-25 23:14:13  glen
 - convert to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cvs.spec?r1=1.167.2.1&r2=1.167.2.2&f=u