rpms/man-pages-fr/devel man-pages-fr.spec,1.12,1.13

[fedora-cvs-commits at redhat.com]

Author: bgroh

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27569

Modified Files:
	man-pages-fr.spec 
Log Message:
added rm for man-pages conflicting with shadow-utils


Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- man-pages-fr.spec	9 Dec 2005 22:41:56 -0000	1.12
+++ man-pages-fr.spec	10 Jan 2006 09:12:33 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: French man pages from the Linux Documentation Project.
 Name: man-pages-fr
 Version: 0.9.7
-Release: 11.1
+Release: 12
 License: Distributable
 Group: Documentation
 Source: ftp://ftp.lip6.fr/pub/linux/french/docs/man-fr-0.9.tar.gz
@@ -52,11 +52,11 @@
     install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/fr/$i; 
 done
 
-# remove these since they conflict with the cups package
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{backend.1,filter.1,lp.1,lpoptions.1,lppasswd.1,lpstat.1,chage.1,gpasswd.1,xawtv.1,lpq.1,lpr.1,lprm.1,apropos.1,man.1,whatis.1}*
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/cups-config.3*
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{classes.conf.5,cupsd.conf.5,mime.convs.5,mime.types.5,printers.conf.5,faillog.5,shadow.5,man.config.5}*
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{accept.8,cups-lpd.8,cups-polld.8,cupsaddsmb.8,cupsd.8,enable.8,lpadmin.8,lpc.8,lpinfo.8,lpmove.8,reject.8,adduser.8,chpasswd.8,useradd.8,userdel.8,usermod.8}*
+# remove these since they conflict with cups and shadow-utils packages
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{backend.1,filter.1,lp.1,lpoptions.1,lppasswd.1,lpstat.1,chage.1,gpasswd.1,xawtv.1,lpq.1,lpr.1,lprm.1,apropos.1,man.1,whatis.1,newgrp.1,sg.1}*
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/{cups-config.3,getspnam.3,shadow.3}*
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{classes.conf.5,cupsd.conf.5,mime.convs.5,mime.types.5,printers.conf.5,faillog.5,shadow.5,man.config.5,gshadow.5,login.defs.5}*
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{accept.8,cups-lpd.8,cups-polld.8,cupsaddsmb.8,cupsd.8,enable.8,lpadmin.8,lpc.8,lpinfo.8,lpmove.8,reject.8,adduser.8,chpasswd.8,useradd.8,userdel.8,usermod.8,faillog.8,groupadd.8,groupdel.8,groupmod.8,grpck.8,grpconv.8,grpunconv.8,lastlog.8,newusers.8,pwck.8,pwconv.8,pwunconv.8}*
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -68,6 +68,9 @@
 %{_mandir}/fr/*
 
 %changelog
+* Tue Jan 10 2006 Bernd Groh <bgroh at redhat.com>
+- remove pages that conflict with shadow-utils
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt