rpms/man-pages-es/devel man-pages-es.spec,1.19,1.20

[Ding-Yi Chen (dchen)]

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-es/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9113/devel

Modified Files:
	man-pages-es.spec 
Log Message:
[Bug 427684] Fix the conflict with vipw.8 (in shadow-utils)


Index: man-pages-es.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-es/devel/man-pages-es.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- man-pages-es.spec	7 Dec 2007 03:02:30 -0000	1.19
+++ man-pages-es.spec	8 Jan 2008 00:03:13 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Spanish man pages from the Linux Documentation Project
 Name: man-pages-es
 Version: 1.55
-Release: 4%{?dist}
+Release: 5%{?dist}
 # These man pages come under various copyrights.
 # All are freely distributable when the nroff source is included.
 License: IEEE
@@ -95,6 +95,9 @@
 rm $RPM_BUILD_ROOT%{_mandir}/es/LEEME.extra
 rm $RPM_BUILD_ROOT%{_mandir}/es/PAQUETES
 rm $RPM_BUILD_ROOT%{_mandir}/es/PROYECTO
+#[Bug 427684] man-pages fileconflict
+#- Fix the conflict with vipw.8 (in shadow-utils)
+rm $RPM_BUILD_ROOT%{_mandir}/es/man8/vipw.8
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -1701,12 +1704,15 @@
 %{_mandir}/es/man8/update.8.gz
 %{_mandir}/es/man8/vidmode.8.gz
 %{_mandir}/es/man8/vigr.8.gz
-%{_mandir}/es/man8/vipw.8.gz
 %{_mandir}/es/man8/vmstat.8.gz
 
 
 
 %changelog
+* Tue Jan 08 2008 Ding-Yi Chen <dchen at redhat.com> - 1.55-5
+- Bug 427684: man-pages fileconflict
+- Fix the conflict with vipw.8 (in shadow-utils)
+
 * Fri Dec 06 2007 Ding-Yi Chen <dchen at redhat.com> - 1.55-4
 - [Bug 226124]  Merge Review: man-pages-es (comment 10)
 - Fix improper SPEC file
@@ -1759,17 +1765,17 @@
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Wed Nov 14 2001 Trond Eivind Glomsré·£ <teg at redhat.com> 1.28-1
+* Wed Nov 14 2001 Trond Eivind Glomsrø <teg at redhat.com> 1.28-1
 - 1.28
 - New URL
 
-* Mon Aug 13 2001 Trond Eivind Glomsré·£ <teg at redhat.com> 0.6a-9
+* Mon Aug 13 2001 Trond Eivind Glomsrø <teg at redhat.com> 0.6a-9
 - Rebuild. Should fix #51679
 
-* Thu Aug  2 2001 Trond Eivind Glomsré·£ <teg at redhat.com>
+* Thu Aug  2 2001 Trond Eivind Glomsrø <teg at redhat.com>
 - Own %%{_mandir}/es
 
-* Tue Apr  3 2001 Trond Eivind Glomsré·£ <teg at redhat.com>
+* Tue Apr  3 2001 Trond Eivind Glomsrø <teg at redhat.com>
 - Fix some roff errors in man pages, delete console_codes.4 
   (has error, can't locate it)
 
@@ -1782,8 +1788,8 @@
 * Mon Jun 19 2000 Matt Wilson <msw at redhat.com>
 - defattr root
 
-* Sun Jun 12 2000 Trond Eivind Glomsré·£ <teg at redhat.com>
+* Sun Jun 12 2000 Trond Eivind Glomsrø <teg at redhat.com>
 - use %%{_mandir} and %%{_tmppath}
 
-* Mon May 15 2000 Trond Eivind Glomsré·£ <teg at redhat.com>
+* Mon May 15 2000 Trond Eivind Glomsrø <teg at redhat.com>
 - first build